diff options
| -rw-r--r-- | vars/build.vars | 2 | ||||
| -rw-r--r-- | vars/musl.vars | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/vars/build.vars b/vars/build.vars index af85fbaf..93dfcc60 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -196,10 +196,8 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${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-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-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}"}; : ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin @../../bin/mdso=${DEFAULT_TARGET}/bin/mdso"}; diff --git a/vars/musl.vars b/vars/musl.vars index 147e6766..e33e1248 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -104,6 +104,22 @@ pkg_musl_full_all() { # Musl: build (full) _install=install; pkgp_musl_build_dir "musl-${PKG_VERSION}" native; + if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then + ex_rtl_fetch_url_wget \ + "http://www.musl-libc.org/releases/musl-${PKG_VERSION}.tar.gz" \ + "${PKG_MUSL_NO_COMPLEX_SHA256SUM}"; + ex_rtl_fileop rm "${PKG_BASE_DIR}/mmglue"; + ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "mmglue=${DEFAULT_GITROOT}/mmglue"; + ex_pkg_state_set "${PKG_NAME}" fetch -extract; + fi; + if ! ex_pkg_state_test "${PKG_NAME}" extract "${_restart_at}"; then + ex_rtl_fileop rm "musl-${PKG_VERSION}"; + tar -C "${PKG_BASE_DIR}" -xf "${BUILD_DLCACHEDIR}/musl-${PKG_VERSION}.tar.gz"; + set +o noglob; + ex_rtl_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_VERSION}/"; + set -o noglob; + ex_pkg_state_set "${PKG_NAME}" extract -configure; + fi; if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then pkgp_musl_configure; ex_pkg_state_set "${PKG_NAME}" configure -build; |