diff options
Diffstat (limited to 'vars')
-rw-r--r-- | vars/build.vars | 1 | ||||
-rw-r--r-- | vars/gcc.vars | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/vars/build.vars b/vars/build.vars index 3614d513..59639d5e 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -361,6 +361,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32"; : ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32}; +: ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}}; : ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}}; diff --git a/vars/gcc.vars b/vars/gcc.vars index aa0af83f..45e5ad05 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -126,12 +126,14 @@ 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 gcc_stage1 unknown fetch" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_stage1 unknown patch" >&3; ex_pkg_state_set "${PKG_NAME}" patch -configure; fi; pkgp_gcc_setup_env "${PKG_VERSION}"; @@ -172,10 +174,12 @@ pkg_gcc_stage1_all() { fi; if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then make ${PKG_MAKEFLAGS_BUILD} all-gcc; + echo "step gcc_stage1 unknown build" >&3; ex_pkg_state_set "${PKG_NAME}" build -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; + echo "step gcc_stage1 unknown install_subdirs" >&3; ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then @@ -192,10 +196,12 @@ 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 gcc_stage1 unknown install_make" >&3; ex_pkg_state_set "${PKG_NAME}" install_make -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; + echo "step gcc_stage1 unknown install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -209,18 +215,22 @@ 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 gcc_runtime_host unknown build" >&3; ex_pkg_state_set "${PKG_NAME}" build -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; + echo "step gcc_runtime_host unknown install_subdirs" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_runtime_host unknown install_make" >&3; ex_pkg_state_set "${PKG_NAME}" install_make -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; + echo "step gcc_runtime_host unknown install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -233,18 +243,22 @@ 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 gcc_libstdcpp_v3_host unknown build" >&3; ex_pkg_state_set "${PKG_NAME}" build -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; + echo "step gcc_libstdcpp_v3_host unknown install_subdirs" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_libstdcpp_v3_host unknown install_make" >&3; ex_pkg_state_set "${PKG_NAME}" install_make -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; + echo "step gcc_libstdcpp_v3_host unknown install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -257,18 +271,22 @@ 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 gcc_full_host unknown build" >&3; ex_pkg_state_set "${PKG_NAME}" build -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; + echo "step gcc_full_host unknown install_subdirs" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_full_host unknown install_make" >&3; ex_pkg_state_set "${PKG_NAME}" install_make -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; + echo "step gcc_full_host unknown install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; @@ -281,12 +299,14 @@ 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 gcc_full unknown fetch" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_full unknown patch" >&3; ex_pkg_state_set "${PKG_NAME}" patch -configure; fi; pkgp_gcc_setup_env "${PKG_VERSION}"; @@ -318,18 +338,22 @@ 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 gcc_full unknown build" >&3; ex_pkg_state_set "${PKG_NAME}" build -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then pkg_install_subdirs; + echo "step gcc_full unknown install_subdirs" >&3; ex_pkg_state_set "${PKG_NAME}" 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 gcc_full unknown install_make" >&3; ex_pkg_state_set "${PKG_NAME}" install_make -install; fi; if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then pkg_install; + echo "step gcc_full unknown install" >&3; ex_pkg_state_set "${PKG_NAME}" install finish; fi; }; |