0580af
vars/build.vars:{gcc,musl}_full: process within ${BUILD_WORKDIR}/{gcc,musl}-build-native.
@@ -195,10 +195,10 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
|
|
195
195
|
: ${PKG_MUSL_FULL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
|
196
196
|
: ${PKG_MUSL_FULL_VERSION:=1.1.12};
|
197
197
|
: ${PKG_MUSL_FULL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_NATIVE_VERSION}.tar.gz};
|
198
|
-
: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build};
|
198
|
+
: ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build-native};
|
199
199
|
: ${PKG_MUSL_FULL_NO_CLEAN_BASE_DIR:=1};
|
200
200
|
: ${PKG_GCC_FULL_VERSION:=4.6.4};
|
201
|
-
: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
|
201
|
+
: ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native};
|
202
202
|
: ${PKG_GCC_FULL_NO_CLEAN_BASE_DIR:=1};
|
203
203
|
: ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
|
204
204
|
_TARGET}"};
--target=${DEFAULT
|
@@ -261,6 +261,16 @@ pkg_gcc_full_all() {
|
|
261
261
|
export MAKE="make LIBTOOL=slibtool";
|
262
262
|
# GCC, native.
|
263
263
|
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
|
264
|
+
if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
|
265
|
+
ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
|
266
|
+
ex_pkg_state_set "${PKG_NAME}" fetch -patch;
|
267
|
+
fi;
|
268
|
+
if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
|
269
|
+
if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
|
270
|
+
patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
|
271
|
+
fi;
|
272
|
+
ex_pkg_state_set "${PKG_NAME}" patch -configure;
|
273
|
+
fi;
|
264
274
|
pkgp_gcc_setup_env "${PKG_VERSION}";
|
265
275
|
if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
|
266
276
|
ex_rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
|