From fa26eefbefcfdbac1922dedc67e52acb6f5d8177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Sat, 6 Feb 2016 01:17:24 +0100
Subject: Followup to last commit.

---
 200.coreutils.build | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to '200.coreutils.build')

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
-- 
cgit v1.2.3