diff options
Diffstat (limited to 'vars/gcc.vars')
-rw-r--r-- | vars/gcc.vars | 69 |
1 files changed, 22 insertions, 47 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars index 67bcdb85..d8f48adf 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -4,9 +4,8 @@ # Order: stage1_mingw32, native_mingw32 # -pkgp_gcc_build_dir() { - PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}"; -}; +pkgp_gcc_build_dir() { PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}"; }; +pkgp_gcc_state_set() { echo "step unknown ${PKG_NAME} ${1}" >&3; ex_pkg_state_set "${PKG_NAME}" ${1} -${2}; }; pkgp_gcc_setup_env() { local __=""; @@ -87,7 +86,7 @@ pkgp_gcc_configure() { --enable-threads=posix \ --target="${PKG_TARGET}" \ --with-fpmath=sse; - ex_pkg_state_set "${PKG_NAME}" configure -build; + pkgp_gcc_state_set configure build; }; pkg_gcc_stage1_host_all() { @@ -128,15 +127,13 @@ pkg_gcc_stage1_all() { # GCC, stage1. if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; - echo "step unknown ${PKG_NAME} fetch" >&3; - ex_pkg_state_set "${PKG_NAME}" fetch -patch; + pkgp_gcc_state_set fetch patch; fi; 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; - echo "step unknown ${PKG_NAME} patch" >&3; - ex_pkg_state_set "${PKG_NAME}" patch -configure; + pkgp_gcc_state_set patch configure; fi; pkgp_gcc_setup_env "${PKG_VERSION}"; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then @@ -176,13 +173,11 @@ pkg_gcc_stage1_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-gcc; - echo "step unknown ${PKG_NAME} build" >&3; - ex_pkg_state_set "${PKG_NAME}" build -install; + pkgp_gcc_state_set build install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; - echo "step unknown ${PKG_NAME} install_subdirs" >&3; - ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; + pkgp_gcc_state_set install_subdirs install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then case "${PKG_NAME}" in @@ -198,12 +193,10 @@ pkg_gcc_stage1_all() { ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a" \ ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so"; fi; - echo "step unknown ${PKG_NAME} install_make" >&3; - ex_pkg_state_set "${PKG_NAME}" install_make -install; + pkgp_gcc_state_set install_make install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; - echo "step unknown ${PKG_NAME} install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -217,22 +210,18 @@ pkg_gcc_runtime_host_all() { # GCC, compiler runtime. if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc ${_vis_hide}; - echo "step unknown ${PKG_NAME} build" >&3; - ex_pkg_state_set "${PKG_NAME}" build -install; + pkgp_gcc_state_set build install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; - echo "step unknown ${PKG_NAME} install_subdirs" >&3; - ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; + pkgp_gcc_state_set install_subdirs install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install-target-libgcc; - echo "step unknown ${PKG_NAME} install_make" >&3; - ex_pkg_state_set "${PKG_NAME}" install_make -install; + pkgp_gcc_state_set install_make install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; - echo "step unknown ${PKG_NAME} install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -245,22 +234,18 @@ pkg_gcc_libstdcpp_v3_host_all() { # GCC, libstdc++-v3. if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3; - echo "step unknown ${PKG_NAME} build" >&3; - ex_pkg_state_set "${PKG_NAME}" build -install; + pkgp_gcc_state_set build install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; - echo "step unknown ${PKG_NAME} install_subdirs" >&3; - ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; + pkgp_gcc_state_set install_subdirs install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install-target-libstdc++-v3; - echo "step unknown ${PKG_NAME} install_make" >&3; - ex_pkg_state_set "${PKG_NAME}" install_make -install; + pkgp_gcc_state_set install_make install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; - echo "step unknown ${PKG_NAME} install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -273,22 +258,18 @@ pkg_gcc_full_host_all() { # GCC, everything else. if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD}; - echo "step unknown ${PKG_NAME} build" >&3; - ex_pkg_state_set "${PKG_NAME}" build -install; + pkgp_gcc_state_set build install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; - echo "step unknown ${PKG_NAME} install_subdirs" >&3; - ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; + pkgp_gcc_state_set install_subdirs install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install; - echo "step unknown ${PKG_NAME} install_make" >&3; - ex_pkg_state_set "${PKG_NAME}" install_make -install; + pkgp_gcc_state_set install_make install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; - echo "step unknown ${PKG_NAME} install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -301,15 +282,13 @@ pkg_gcc_full_all() { pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native; if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; - echo "step unknown ${PKG_NAME} fetch" >&3; - ex_pkg_state_set "${PKG_NAME}" fetch -patch; + pkgp_gcc_state_set fetch patch; fi; 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; - echo "step unknown ${PKG_NAME} patch" >&3; - ex_pkg_state_set "${PKG_NAME}" patch -configure; + pkgp_gcc_state_set patch configure; fi; pkgp_gcc_setup_env "${PKG_VERSION}"; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then @@ -340,22 +319,18 @@ pkg_gcc_full_all() { make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3; make ${PKG_MAKEFLAGS_BUILD} all-target-libgfortran; make ${PKG_MAKEFLAGS_BUILD} all; - echo "step unknown ${PKG_NAME} build" >&3; - ex_pkg_state_set "${PKG_NAME}" build -install; + pkgp_gcc_state_set build install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; - echo "step unknown ${PKG_NAME} install_subdirs" >&3; - ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; + pkgp_gcc_state_set install_subdirs install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install; - echo "step unknown ${PKG_NAME} install_make" >&3; - ex_pkg_state_set "${PKG_NAME}" install_make -install; + pkgp_gcc_state_set install_make install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; - echo "step unknown ${PKG_NAME} install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; |