diff options
| -rw-r--r-- | vars/build.vars | 4 | ||||
| -rw-r--r-- | vars/gcc.vars | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/vars/build.vars b/vars/build.vars index 328e3f77..af85fbaf 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -195,10 +195,10 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MUSL_FULL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e}; : ${PKG_MUSL_FULL_VERSION:=1.1.12}; : ${PKG_MUSL_FULL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_NATIVE_VERSION}.tar.gz}; -: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build}; +: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build-native}; : ${PKG_MUSL_FULL_NO_CLEAN_BASE_DIR:=1}; : ${PKG_GCC_FULL_VERSION:=4.6.4}; -: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build}; +: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native}; : ${PKG_GCC_FULL_NO_CLEAN_BASE_DIR:=1}; : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"}; : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${DEFAULT_TARGET}"}; diff --git a/vars/gcc.vars b/vars/gcc.vars index c5e1f22a..76a1437f 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -261,6 +261,16 @@ pkg_gcc_full_all() { export MAKE="make LIBTOOL=slibtool"; # GCC, native. 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}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; + 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; + ex_pkg_state_set "${PKG_NAME}" patch -configure; + fi; pkgp_gcc_setup_env "${PKG_VERSION}"; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then ex_rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}"; |