diff options
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/build.vars | 12 | ||||
| -rw-r--r-- | vars/musl.vars | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/vars/build.vars b/vars/build.vars index 650eeb83..37a75e43 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -145,8 +145,8 @@ 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_SHA256SUM:=44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61}; -: ${PKG_MUSL_NO_COMPLEX_HOST_VERSION:=1.1.20}; +: ${PKG_MUSL_NO_COMPLEX_HOST_SHA256SUM:=c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44}; +: ${PKG_MUSL_NO_COMPLEX_HOST_VERSION:=1.1.21}; : ${PKG_MUSL_NO_COMPLEX_HOST_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION}.tar.gz"} : ${PKG_MUSL_NO_COMPLEX_HOST_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"}; : ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_no_complex-host-${DEFAULT_TARGET}}; @@ -162,8 +162,8 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1}; : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}}; -: ${PKG_MUSL_FULL_HOST_SHA256SUM:=44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61}; -: ${PKG_MUSL_FULL_HOST_VERSION:=1.1.20}; +: ${PKG_MUSL_FULL_HOST_SHA256SUM:=c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f45}; +: ${PKG_MUSL_FULL_HOST_VERSION:=1.1.21}; : ${PKG_MUSL_FULL_HOST_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_HOST_VERSION}.tar.gz"} : ${PKG_MUSL_FULL_HOST_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"}; : ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-host-${DEFAULT_TARGET}}; @@ -278,8 +278,8 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"}; : ${PKG_BINUTILS_LIBTOOL:=slibtool-static}; -: ${PKG_MUSL_FULL_SHA256SUM:=44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61}; -: ${PKG_MUSL_FULL_VERSION:=1.1.20}; +: ${PKG_MUSL_FULL_SHA256SUM:=c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44}; +: ${PKG_MUSL_FULL_VERSION:=1.1.21}; : ${PKG_MUSL_FULL_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_VERSION}.tar.gz"} : ${PKG_MUSL_FULL_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"}; : ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl_full-native-${DEFAULT_TARGET}}; diff --git a/vars/musl.vars b/vars/musl.vars index 5b2b984d..94975844 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -2,22 +2,16 @@ # set -o errexit -o noglob are assumed. # -pkgp_mmglue_fetch_download() { - ex_rtl_fileop rm "${PKG_BASE_DIR}/mmglue"; - ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "mmglue=${DEFAULT_GITROOT}/mmglue@main"; - ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract; +pkg_musl_full_fetch_download_post() { + ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue"; }; -pkg_musl_full_fetch_download() { - pkgp_mmglue_fetch_download; +pkg_musl_full_host_fetch_download_post() { + ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue"; }; -pkg_musl_full_host_fetch_download() { - pkgp_mmglue_fetch_download; -}; - -pkg_musl_no_complex_host_fetch_download() { - pkgp_mmglue_fetch_download; +pkg_musl_no_complex_host_fetch_download_post() { + ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue"; }; # vim:filetype=sh |