From 32ad217d197203a97dfcc0076e748731d2315c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 22 Nov 2017 01:32:50 +0000 Subject: subr/*: reorganised as {ex{,_{pkg,rtl,setup}},pkg}_*. --- vars/build.vars | 2 + vars/clang_host.vars | 10 ++--- vars/cmake.vars | 2 +- vars/dist_digest.vars | 4 +- vars/dist_tarballs.vars | 24 +++++------ vars/env.vars | 13 +++--- vars/gcc.vars | 96 ++++++++++++++++++++++---------------------- vars/git.vars | 2 +- vars/install_strip_host.vars | 2 +- vars/libxml2.vars | 2 +- vars/llvm_host.vars | 10 ++--- vars/musl.vars | 58 +++++++++++++------------- vars/nginx.vars | 2 +- vars/perl.vars | 10 ++--- vars/pkgconf_host.vars | 8 ++-- vars/psxstub.vars | 4 +- vars/python3.vars | 6 +-- vars/vim.vars | 2 +- 18 files changed, 129 insertions(+), 128 deletions(-) (limited to 'vars') diff --git a/vars/build.vars b/vars/build.vars index b42b68ed..a792d3d5 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1,6 +1,7 @@ # # Build target invariants # +INVARIANTS_BUILD_TYPE="host"; INVARIANTS_PACKAGES="chainport"; : ${PKG_CHAINPORT_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"}; : ${PKG_CHAINPORT_BUILD_STEPS_DISABLE:="configure:dynamic build:dynamic install_make:dynamic install:dynamic"}; @@ -949,6 +950,7 @@ DIST_PACKAGES="dist_etc dist_digest dist_tarballs"; # # Build meta-targets # +INVARIANTS_TARGET="invariants"; DEVROOT_TARGET="host_toolchain native_toolchain runtime"; DEV_TARGET="${DEVROOT_TARGET} dev_packages"; WORLD_TARGET="${DEVROOT_TARGET} host_packages lib_packages leaf_packages minipix dist"; diff --git a/vars/clang_host.vars b/vars/clang_host.vars index 06bf2001..01413bee 100644 --- a/vars/clang_host.vars +++ b/vars/clang_host.vars @@ -3,10 +3,10 @@ # pkg_clang_host_configure() { - build_fileop rm "../cfe-${PKG_VERSION}-host"; - build_fileop mkdir "../cfe-${PKG_VERSION}-host"; - build_fileop cd "../cfe-${PKG_VERSION}-host"; - log_msg info "Bootstrapping clang_host..."; + ex_build_fileop rm "../cfe-${PKG_VERSION}-host"; + ex_build_fileop mkdir "../cfe-${PKG_VERSION}-host"; + ex_build_fileop cd "../cfe-${PKG_VERSION}-host"; + ex_log_msg info "Bootstrapping clang_host..."; ("${PREFIX}/bin/cmake" \ "../cfe-${PKG_VERSION}.src" \ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \ @@ -19,7 +19,7 @@ pkg_clang_host_configure() { -DLLVM_PREFIX="${PKG_PREFIX}" \ -G "Unix Makefiles" \ -Wno-dev); - log_msg info "Finished bootstrapping clang_host."; + ex_log_msg info "Finished bootstrapping clang_host."; }; # vim:filetype=sh diff --git a/vars/cmake.vars b/vars/cmake.vars index de8aa90c..2c8d19dc 100644 --- a/vars/cmake.vars +++ b/vars/cmake.vars @@ -3,7 +3,7 @@ # pkg_cmake_configure() { - build_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \ + ex_build_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \ "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake"; rm -f config.cache; env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \ diff --git a/vars/dist_digest.vars b/vars/dist_digest.vars index 5d28af38..de94df72 100644 --- a/vars/dist_digest.vars +++ b/vars/dist_digest.vars @@ -5,9 +5,9 @@ pkg_dist_digest_all() { local __; if [ -n "${ARG_TARBALL}" ]; then - log_msg info "Compiling SHA256 sums..."; + ex_log_msg info "Compiling SHA256 sums..."; if [ -e "${PREFIX}/SHA256SUMS" ]; then - build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last"; + ex_build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last"; fi; (cd "${PREFIX}"; for __ in $(find "${PREFIX_NATIVE#${PREFIX}/}" -type f -perm /a=x \ diff --git a/vars/dist_tarballs.vars b/vars/dist_tarballs.vars index 43f52184..f39ac170 100644 --- a/vars/dist_tarballs.vars +++ b/vars/dist_tarballs.vars @@ -11,12 +11,12 @@ pkgp_dist_tarball_dist() { -not -path ./tmp -not -path ./tmp/\*) \ midipix_shortcut.vbs midipix.sh README SHA256SUMS |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_FNAME}"; - log_msg info "Finished building binary distribution tarball."; + ex_log_msg info "Finished building binary distribution tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] && \ gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then gpg --armor --passphrase-file /dev/null \ --local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}"; - log_msg info "Signed binary distribution tarball."; + ex_log_msg info "Signed binary distribution tarball."; fi; }; @@ -24,12 +24,12 @@ pkgp_dist_tarball_toolchain() { TARBALL_CROSS_FNAME="${TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; tar -cpf - bin include lib lib64 libexec share "${TARGET}" |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}"; - log_msg info "Finished building toolchain tarball."; + ex_log_msg info "Finished building toolchain tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] && \ gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then gpg --armor --passphrase-file /dev/null \ --local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_CROSS_FNAME}"; - log_msg info "Signed toolchain tarball."; + ex_log_msg info "Signed toolchain tarball."; fi; }; @@ -38,36 +38,36 @@ pkgp_dist_tarball_minipix() { tar -cpf - minipix \ midipix_shortcut.vbs midipix.sh README |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_MINIPIX_FNAME}"; - log_msg info "Finished building binary Minipix distribution tarball."; + ex_log_msg info "Finished building binary Minipix distribution tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] && \ gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then gpg --armor --passphrase-file /dev/null \ --local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_MINIPIX_FNAME}"; - log_msg info "Signed binary Minipix distribution tarball."; + ex_log_msg info "Signed binary Minipix distribution tarball."; fi; }; pkgp_dist_tarball_src() { TARBALL_SRC_FNAME="${TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${TARBALL_SUFFIX}"; - log_msg info "Building source tarball..."; + ex_log_msg info "Building source tarball..."; tar -cpf - $(find tmp -mindepth 2 -maxdepth 2 \ -not -path tmp/.\* \ -not -path tmp/ntctty/.git \ -not -path tmp/psxscl/.git \ -not -path tmp/ptycon/.git) |\ "${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}"; - log_msg info "Finished building source tarball."; + ex_log_msg info "Finished building source tarball."; if [ -x "$(which gpg 2>/dev/null)" -a -n "${TARBALL_SIGN_GPG_KEY}" ] && \ gpg --list-keys "${TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then gpg --armor --passphrase-file /dev/null \ --local-user "${TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_SRC_FNAME}"; - log_msg info "Signed source tarball."; + ex_log_msg info "Signed source tarball."; fi; }; pkg_dist_tarballs_all() { if [ -n "${ARG_TARBALL}" ]; then - log_msg info "Building distribution tarballs..."; + ex_log_msg info "Building distribution tarballs..."; case "${TARBALL_SUFFIX}" in bz2) if [ -n "$(which pbzip2 2>/dev/null)" ]; then TARBALL_COMPRESS_CMD="pbzip2"; @@ -81,9 +81,9 @@ pkg_dist_tarballs_all() { fi; ;; xz) TARBALL_COMPRESS_CMD="xz"; TARBALL_COMPRESS_ARGS="-T0"; ;; - *) log_msg failexit "Unknown tarball suffix \`.${TARBALL_SUFFIX}'."; + *) ex_log_msg failexit "Unknown tarball suffix \`.${TARBALL_SUFFIX}'."; esac; - build_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}"; + ex_build_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}"; pkgp_dist_tarball_dist; pkgp_dist_tarball_toolchain; pkgp_dist_tarball_minipix; if [ "${BUILD}" = "debug" ]; then pkgp_dist_tarball_src; diff --git a/vars/env.vars b/vars/env.vars index 0ed61756..cac525c7 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -16,14 +16,13 @@ : ${PREFIX_CROSS:=${PREFIX}/${TARGET}}; : ${DLCACHEDIR:=${PREFIX_ROOT}/dlcache}; : ${WORKDIR:=${PREFIX}/tmp}; -: ${BUILD_STEPS:="setup_vars:invariant setup_env:invariant setup_distclean:variant setup_subdirs:invariant - all:all - fetch_wget:dynamic fetch_git:dynamic fetch_extract:dynamic fetch_subdirs:invariant fetch:virtual +: ${BUILD_STEPS:="all:all + fetch_distclean:variant fetch_wget:dynamic fetch_git:dynamic fetch_extract:dynamic fetch_subdirs:invariant fetch:virtual configure_patch_pre:dynamic configure_autotools:dynamic configure_patch:dynamic configure:dynamic build_clean:variant build:dynamic install_subdirs:dynamic install_make:dynamic install_files:dynamic install_libs:dynamic install_pkgconfig:dynamic install_purge_la:dynamic install_strip:dynamic install:dynamic - finish:invariant"}; + finish:finish"}; : ${PKG_BUILD_VARS:="BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE CONFIGURE_ARGS @@ -45,10 +44,10 @@ : ${DEFAULT_CFLAGS_RELEASE:="-g0 -O2"}; : ${DEFAULT_CFLAGS_RELEASE_HOST:="-g0 -O2"}; : ${DEFAULT_CFLAGS_RELEASE_RUNTIME:="-g0 -O2"}; -: ${DEFAULT_CFLAGS:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")")}; +: ${DEFAULT_CFLAGS:=$(ex_get_var_unsafe "DEFAULT_CFLAGS_$(ex_toupper "${BUILD}")")}; : ${DEFAULT_CFLAGS_CONFIGURE:=${DEFAULT_CFLAGS}}; -: ${DEFAULT_CFLAGS_HOST:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")_HOST")}; -: ${DEFAULT_CFLAGS_RUNTIME:=$(get_var_unsafe "DEFAULT_CFLAGS_$(toupper "${BUILD}")_RUNTIME")}; +: ${DEFAULT_CFLAGS_HOST:=$(ex_get_var_unsafe "DEFAULT_CFLAGS_$(ex_toupper "${BUILD}")_HOST")}; +: ${DEFAULT_CFLAGS_RUNTIME:=$(ex_get_var_unsafe "DEFAULT_CFLAGS_$(ex_toupper "${BUILD}")_RUNTIME")}; : ${DEFAULT_GITROOT:=git://midipix.org}; : ${DEFAULT_GITROOT_HEAD:=git://midipix.org}; : ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR}; diff --git a/vars/gcc.vars b/vars/gcc.vars index 5391aeec..277ba8a8 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -39,9 +39,9 @@ pkgp_gcc_setup_env() { }; pkgp_gcc_configure() { - build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; - build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; "../cbb-gcc-${PKG_GCC_VERSION}/configure" "${@}"\ --disable-bootstrap \ --disable-libmudflap \ @@ -64,7 +64,7 @@ pkgp_gcc_configure() { --enable-threads=posix \ --target="${PKG_TARGET}" \ --with-fpmath=sse; - set_build_script_done "${PKG_NAME}" configure -build; + ex_pkg_state_push "${PKG_NAME}" configure -build; }; pkg_gcc_stage1_cross_x86_64_w64_mingw32_all() { @@ -84,33 +84,33 @@ pkg_gcc_stage1_all() { case "${PKG_NAME}" in gcc_stage1) PKG_GCC_VERSION="${PKG_GCC_STAGE1_VERSION}"; - set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross; ;; gcc_stage1_cross_x86_64_w64_mingw32) PKG_GCC_VERSION="${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_VERSION}"; - set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross; ;; gcc_stage1_native_x86_64_w64_mingw32) PKG_GCC_VERSION="${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_VERSION}"; - set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native; ;; esac; # GCC, stage1. - if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then pkg_fetch_git "cbb-gcc-${PKG_GCC_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}"; - set_build_script_done "${PKG_NAME}" fetch -patch; + ex_pkg_state_push "${PKG_NAME}" fetch -patch; fi; - if ! is_build_script_done "${PKG_NAME}" patch "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch"; fi; - set_build_script_done "${PKG_NAME}" patch -configure; + ex_pkg_state_push "${PKG_NAME}" patch -configure; fi; pkgp_gcc_setup_env "${PKG_GCC_VERSION}"; - if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then - build_fileop mkdir "${PKG_PREFIX}/include"; + if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then + ex_build_fileop mkdir "${PKG_PREFIX}/include"; [ \! -d "${PKG_PREFIX}/usr" ] && \ - build_fileop ln_symbolic . "${PKG_PREFIX}/usr"; + ex_build_fileop ln_symbolic . "${PKG_PREFIX}/usr"; case "${PKG_NAME}" in gcc_stage1) pkgp_gcc_configure \ @@ -137,13 +137,13 @@ pkg_gcc_stage1_all() { --without-headers; ;; esac; else - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; fi; - if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-gcc; - set_build_script_done "${PKG_NAME}" build -install; + ex_pkg_state_push "${PKG_NAME}" build -install; fi; - if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then case "${PKG_NAME}" in gcc_stage1) make ${PKG_MAKEFLAGS_BUILD} install-gcc; ;; @@ -154,10 +154,10 @@ pkg_gcc_stage1_all() { esac; __="$(uname -s)"; if [ "${__#*CYGWIN*}" != "${__}" ]; then - build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a" \ - build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so"; + ex_build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a" \ + ex_build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so"; fi; - set_build_script_done "${PKG_NAME}" install finish; + ex_pkg_state_push "${PKG_NAME}" install finish; fi; exit 0; }; @@ -165,16 +165,16 @@ pkg_gcc_stage1_all() { pkg_gcc_runtime_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; - set_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross; - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, compiler runtime. - if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc; - set_build_script_done "${PKG_NAME}" build -install; + ex_pkg_state_push "${PKG_NAME}" build -install; fi; - if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} install-target-libgcc; - set_build_script_done "${PKG_NAME}" install finish; + ex_pkg_state_push "${PKG_NAME}" install finish; fi; exit 0; }; @@ -182,16 +182,16 @@ pkg_gcc_runtime_all() { pkg_gcc_libstdcpp_v3_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; - set_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross; - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, libstdc++-v3. - if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3; - set_build_script_done "${PKG_NAME}" build -install; + ex_pkg_state_push "${PKG_NAME}" build -install; fi; - if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} install-target-libstdc++-v3; - set_build_script_done "${PKG_NAME}" install finish; + ex_pkg_state_push "${PKG_NAME}" install finish; fi; exit 0; }; @@ -199,16 +199,16 @@ pkg_gcc_libstdcpp_v3_all() { pkg_gcc_full_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; - set_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross; - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; # GCC, everything else. - if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD}; - set_build_script_done "${PKG_NAME}" build -install; + ex_pkg_state_push "${PKG_NAME}" build -install; fi; - if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} install; - set_build_script_done "${PKG_NAME}" install finish; + ex_pkg_state_push "${PKG_NAME}" install finish; fi; exit 0; }; @@ -218,12 +218,12 @@ pkg_gcc_native_all() { PKG_GCC_VERSION="${PKG_GCC_NATIVE_VERSION}"; export MAKE="make LIBTOOL=slibtool"; # GCC, native. - set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native; + ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native; pkgp_gcc_setup_env "${PKG_GCC_VERSION}"; - if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then - build_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}"; + if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then + ex_build_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}"; if [ \! -d "${PKG_PREFIX}/${PKG_TARGET}/usr" ]; then - build_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr"; + ex_build_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr"; fi; if [ "${ARCH}" = nt32 ]; then _configure_host="i686-nt32-midipix"; @@ -240,18 +240,18 @@ pkg_gcc_native_all() { --with-mpfr="${PKG_PREFIX}" \ --with-sysroot=; else - build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; fi; - if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-gcc; make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc; make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3; make ${PKG_MAKEFLAGS_BUILD} all; - set_build_script_done "${PKG_NAME}" build -install; + ex_pkg_state_push "${PKG_NAME}" build -install; fi; - if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then + if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" install; - set_build_script_done "${PKG_NAME}" install finish; + ex_pkg_state_push "${PKG_NAME}" install finish; fi; exit 0; }; diff --git a/vars/git.vars b/vars/git.vars index 873d0921..fc5fb89c 100644 --- a/vars/git.vars +++ b/vars/git.vars @@ -6,7 +6,7 @@ pkg_git_install_post() { local __ _new; for __ in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do _new="$(echo ${__} | sed "s/::/./g")"; - build_fileop mv "${__}" "${_new}"; + ex_build_fileop mv "${__}" "${_new}"; done; }; diff --git a/vars/install_strip_host.vars b/vars/install_strip_host.vars index 081226bd..5e8524a8 100644 --- a/vars/install_strip_host.vars +++ b/vars/install_strip_host.vars @@ -4,7 +4,7 @@ pkg_install_strip_host_all() { if [ -e "${PREFIX}/bin/${TARGET}-install-strip" ]; then - build_fileop rm "${PREFIX}/bin/${TARGET}-install-strip"; + ex_build_fileop rm "${PREFIX}/bin/${TARGET}-install-strip"; fi; cat > "${PREFIX}/bin/${TARGET}-install-strip" < "${PREFIX}/bin/${TARGET}-xml2-config" < "${PREFIX}/bin/${TARGET}-pkg-config" <