diff options
| -rw-r--r-- | build.vars | 5 | ||||
| -rw-r--r-- | pkg.build | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -95,7 +95,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_BASH_VERSION:=4.3}; : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; -: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"}; +: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"}; : ${PKG_BASH_PATCHES_EXTRA_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}-patches/}; : ${PKG_BINUTILS_VERSION:=2.24.51}; : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; @@ -111,8 +111,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}"; : ${PKG_COREUTILS_VERSION:=8.23}; : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d}; : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz}; -: ${PKG_COREUTILS_LDFLAGS_BUILD_EXTRA:=-static}; -: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:="SHARED=0 V=99"}; +: ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:="V=99"}; : ${PKG_CURL_VERSION:=7.47.1}; : ${PKG_CURL_SHA256SUM:=ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f}; : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2}; @@ -20,7 +20,21 @@ if test_cmd pkg_${PKG_NAME}_finish; then elif [ "${PKG_URL_TYPE:-wget}" = wget ] &&\ ! is_build_script_done extract; then rm_if_exists ${PKG_SUBDIR}; - tar -axf ${PKG_FNAME}; + if [ "${PKG_FNAME##*.tar.}" = "bz2" ]; then + bunzip2 -d < ${PKG_FNAME} | tar -xf -; + elif [ "${PKG_FNAME##*.tar.}" = "gz" ]; then + gunzip -d < ${PKG_FNAME} | tar -xf -; + elif [ "${PKG_FNAME##*.tar.}" = "xz" ]; then + xz -d < ${PKG_FNAME} | tar -xf -; + elif [ "${PKG_FNAME##*.t}" = "bz2" ]; then + bunzip2 -d < ${PKG_FNAME} | tar -xf -; + elif [ "${PKG_FNAME##*.t}" = "gz" ]; then + gunzip -d < ${PKG_FNAME} | tar -xf -; + elif [ "${PKG_FNAME##*.t}" = "xz" ]; then + xz -d < ${PKG_FNAME} | tar -xf -; + else + tar -xf ${PKG_FNAME}; + fi; if test_cmd pkg_${PKG_NAME}_extract_post; then pkg_${PKG_NAME}_extract_post; fi; |