diff options
| -rw-r--r-- | vars/build.vars | 5 | ||||
| -rw-r--r-- | vars/musl.vars | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/vars/build.vars b/vars/build.vars index 27d57cf5..eb52182c 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -92,14 +92,13 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_PSXSTUB_HOST_BUILD_STEPS_DISABLE:=build}; : ${PKG_PSXSTUB_HOST_ENV_VARS_EXTRA:=TARGET=${DEFAULT_TARGET}}; : ${PKG_MUSL_NO_COMPLEX_HOST_VERSION:=1.1.12}; -: ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl-build}; +: ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_no_complex-build}; : ${PKG_GCC_RUNTIME_HOST_VERSION:=4.6.4}; : ${PKG_GCC_RUNTIME_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build}; : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1}; : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}}; : ${PKG_MUSL_FULL_HOST_VERSION:=1.1.12}; -: ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl-build}; -: ${PKG_MUSL_FULL_HOST_NO_CLEAN_BASE_DIR:=1}; +: ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-build}; : ${PKG_GCC_LIBSTDCPP_V3_HOST_VERSION:=4.6.4}; : ${PKG_GCC_LIBSTDCPP_V3_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build}; : ${PKG_GCC_LIBSTDCPP_V3_HOST_NO_CLEAN_BASE_DIR:=1}; diff --git a/vars/musl.vars b/vars/musl.vars index e33e1248..9f8473d1 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -76,6 +76,22 @@ pkg_musl_full_host_all() { # Musl: build (full) _install=install; pkgp_musl_build_dir "musl-${PKG_VERSION}" cross; + 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; |