diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-02-06 01:17:24 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-02-06 01:17:24 +0100 |
| commit | fa26eefbefcfdbac1922dedc67e52acb6f5d8177 (patch) | |
| tree | 9521200c0ea928fc774c85531a910bca39118d73 | |
| parent | f5eeeec43bd48f7ab09bf64d4abfa690a84f9cc4 (diff) | |
| download | midipix_build-fa26eefbefcfdbac1922dedc67e52acb6f5d8177.tar.bz2 midipix_build-fa26eefbefcfdbac1922dedc67e52acb6f5d8177.tar.xz | |
Followup to last commit.
| -rw-r--r-- | 200.coreutils.build | 29 | ||||
| -rw-r--r-- | 207.libz.build | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/200.coreutils.build b/200.coreutils.build index a4e37425..8e809e2d 100644 --- a/200.coreutils.build +++ b/200.coreutils.build @@ -1,17 +1,17 @@ export CFLAGS="${CFLAGS_PACKAGES}"; parse_with_pkg_name "${2}" \ - "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${COREUTILS_VERSION}.tar.xz" "" \ - "ftp://ftp.gnu.org/gnu/diffutils/diffutils-${DIFFUTILS_VERSION}.tar.xz" "" \ - "http://alpha.gnu.org/gnu/findutils/findutils-${FINDUTILS_VERSION}.tar.gz" \ + "https://ftp.gnu.org/gnu/coreutils/coreutils-${COREUTILS_VERSION}.tar.xz" "" \ + "https://ftp.gnu.org/gnu/diffutils/diffutils-${DIFFUTILS_VERSION}.tar.xz" "" \ + "https://alpha.gnu.org/gnu/findutils/findutils-${FINDUTILS_VERSION}.tar.gz" \ "CFLAGS=${CFLAGS:+${CFLAGS} }-Dendpwent=setpwent" \ - "ftp://ftp.gnu.org/gnu/patch/patch-${PATCH_VERSION}.tar.gz" "" \ - "ftp://ftp.gnu.org/gnu/gawk/gawk-${GAWK_VERSION}.tar.xz" "" \ - "ftp://ftp.gnu.org/gnu/bash/bash-${BASH_VERSION}.tar.gz" \ + "https://ftp.gnu.org/gnu/patch/patch-${PATCH_VERSION}.tar.gz" "" \ + "https://ftp.gnu.org/gnu/gawk/gawk-${GAWK_VERSION}.tar.xz" "" \ + "https://ftp.gnu.org/gnu/bash/bash-${BASH_VERSION}.tar.gz" \ "_configure_extra_args=--without-bash-malloc" \ - "ftp://ftp.gnu.org/gnu/make/make-${MAKE_VERSION}.tar.bz2" "" \ - "ftp://ftp.gnu.org/gnu/grep/grep-${GREP_VERSION}.tar.xz" "" \ - "ftp://ftp.gnu.org/gnu/grep/grep-${GREP_VERSION}.tar.xz" "" \ - "ftp://ftp.gnu.org/gnu/sed/sed-${SED_VERSION}.tar.bz2" "" \ + "https://ftp.gnu.org/gnu/make/make-${MAKE_VERSION}.tar.bz2" "" \ + "https://ftp.gnu.org/gnu/grep/grep-${GREP_VERSION}.tar.xz" "" \ + "https://ftp.gnu.org/gnu/grep/grep-${GREP_VERSION}.tar.xz" "" \ + "https://ftp.gnu.org/gnu/sed/sed-${SED_VERSION}.tar.bz2" "" \ "ftp://sourceware.org/pub/binutils/snapshots/binutils-${BINUTILS_VERSION}.tar.bz2" ""; if is_build_script_done finished; then @@ -20,8 +20,10 @@ else fetch "${_pkg_url}"; if [ "${_pkg_name}" = "binutils" ]\ && [ "${3}" = "host" ]; then - _configure_extra_args="--disable-werror,--prefix=${PREFIX},--with-sysroot=${PREFIX_TARGET}"; + _configure_args="--disable-werror,--prefix=${PREFIX},--with-sysroot=${PREFIX_TARGET}"; _no_config_cache=${_no_prefix:=1}; _target="${TARGET}"; + else + _configure_args="-C,--host=${HOST_NATIVE},--prefix=${_configure_extra_args:+,${_configure_extra_args}}"; fi; fi; if ! is_build_script_done extracted; then @@ -40,10 +42,7 @@ if ! is_build_script_done configured; then cp -a "../portage/config.cache" .; run_configure_with_extra_args \ "../${_pkg_subdir}/configure" \ - "${_configure_extra_args}" \ - -C \ - --host="${HOST_NATIVE}" \ - --prefix= \ + "${_configure_args}" \ --target="${TARGET}"; set_build_script_done configured -built; else diff --git a/207.libz.build b/207.libz.build index 5dbd2b65..416acdf6 100644 --- a/207.libz.build +++ b/207.libz.build @@ -5,7 +5,7 @@ elif [ "x${2}" = "xlibz" ]; then _pkg_fname="${_pkg_url##*/}"; _pkg_subdir="${2}-${LIBZ_VERSION}"; elif [ "x${2}" = "xgzip" ]; then - _pkg_url="ftp://ftp.gnu.org/gnu/gzip/gzip-${GZIP_VERSION}.tar.gz"; + _pkg_url="https://ftp.gnu.org/gnu/gzip/gzip-${GZIP_VERSION}.tar.gz"; _pkg_fname="${_pkg_url##*/}"; _pkg_subdir="${2}-${GZIP_VERSION}"; fi; |