diff options
| -rw-r--r-- | 200.coreutils.build | 15 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | build.subr | 3 | ||||
| -rw-r--r-- | build.vars | 1 |
4 files changed, 16 insertions, 5 deletions
diff --git a/200.coreutils.build b/200.coreutils.build index cf445fb9..a0c72efb 100644 --- a/200.coreutils.build +++ b/200.coreutils.build @@ -1,5 +1,5 @@ -parse_with_pkg_name ${2} \ - coreutils diffutils findutils patch \ +parse_with_pkg_name ${2} \ + coreutils diffutils findutils patch \ gawk bash make grep sed binutils; if is_build_script_done finished; then exit 212; @@ -22,6 +22,15 @@ if ! is_build_script_done extracted; then set_build_script_done extracted -patched; fi; if ! is_build_script_done patched; then + if [ -n "${_pkg_patches_extra}" ]; then + (rm_if_exists -m -c ${_pkg_subdir}-patches-extra; + wget -c -nd -np -r -R \*.htm\* ${_pkg_patches_extra} + for _patch_fname in \ + $(find . -type f -not -iname \*.sig | sort); do + patch -d ../${_pkg_subdir} -p0 \ + < ${_patch_fname}; + done); wait; + fi; patch -d ${_pkg_subdir} -p1 \ < portage/${_pkg_subdir}.midipix.patch; set_build_script_done patched -configured; @@ -30,7 +39,7 @@ if ! is_build_script_done configured; then rm_if_exists -m -c ${_build_dir}; [ ${_no_config_cache:-0} -eq 0 ] &&\ cp ../portage/config.cache .; - ../${_pkg_subdir}/configure \ + ../${_pkg_subdir}/configure \ ${_configure_args} --target=${TARGET}; set_build_script_done configured -built; else @@ -4,7 +4,7 @@ unset AR ARFLAGS CC CFLAGS CXX CXXFLAGS LD LDFLAGS; . ./build.vars; . ./build.subr; check_path_vars PREFIX PREFIX_NATIVE WORKDIR; -check_prereqs git make openssl sed tar tr wget; +check_prereqs git make openssl sed sort tar tr wget; log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE:=$(date %Y-%m-%d-%H-%M-%S)}."; #trap (set -o errexit; mkdir -p ${PREFIX} ${WORKDIR}); @@ -99,7 +99,8 @@ parse_with_pkg_name() { _pkg_NAME=$(echo "${_pkg_name}" | tr a-z A-Z); for _vname in \ configure_extra_args no_libtool_midipix \ - prefix prefix_extra sha256sum url version \ + patches_extra prefix prefix_extra sha256sum \ + url version \ CC CFLAGS LDFLAGS DESTDIR; do _vNAME=$(echo "${_vname}" | tr a-z A-Z); if [ -n "${_vval:=$(eval echo \${PKG_${_pkg_NAME}_${_vNAME}})}" ]; then @@ -29,6 +29,7 @@ TIMESTAMP_FMT="%Y/%m/%d %H:%M:%S"; : ${PKG_BASH_CONFIGURE_EXTRA_ARGS:=--without-bash-malloc}; : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4}; : ${PKG_BASH_VERSION:=4.3}; +: ${PKG_BASH_PATCHES_EXTRA:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}-patches/}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; : ${PKG_BINUTILS_CONFIGURE_EXTRA_ARGS:=--with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/}; : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; |