[gentoo-commits] proj/genkernel:master commit in: gkbuilds/, /

[Thomas Deutschmann]

commit:     0b4c50fb24e49b2157292a799d78d386429e2331
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:10:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b4c50fb

busybox: Honor toolchain

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_determineargs.sh     |  2 +-
 gen_funcs.sh             |  9 +++++++++
 gkbuilds/busybox.gkbuild | 19 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b464505..d145d16 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -261,7 +261,7 @@ determine_output_filenames() {
 determine_real_args() {
 	# Unset known variables which will interfere with _tc-getPROG().
 	local tc_var tc_varname_build tc_vars=$(get_tc_vars)
-	for tc_var in ${tc_vars}
+	for tc_var in ${tc_vars} BROOT
 	do
 		tc_varname_build="BUILD_${tc_var}"
 		unset ${tc_var} ${tc_varname_build}

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 6917202..69e7242 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1304,6 +1304,15 @@ tc-getOBJDUMP() {
 	tc-getPROG OBJDUMP objdump "$@"
 }
 
+tc-getPKG_CONFIG() {
+	if [ -n "${BROOT}" ]
+	then
+		echo "${BROOT}/usr/bin/pkg-config-wrapper"
+	else
+		tc-getPROG PKG_CONFIG pkg-config "$@"
+	fi
+}
+
 tc-getREADELF() {
 	tc-getPROG READELF readelf "$@"
 }

diff --git a/gkbuilds/busybox.gkbuild b/gkbuilds/busybox.gkbuild
index df99392..ac09363 100644
--- a/gkbuilds/busybox.gkbuild
+++ b/gkbuilds/busybox.gkbuild
@@ -1,9 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
 	default
 
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || gen_die
+
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^HOSTCXX/s:=.*:= $(tc-getBUILD_CXX):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || gen_die
+
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+
 	cp "${TEMP}"/busybox-config "${S}"/.config \
 		|| die "Failed top copy '${TEMP}/busybox-config' to '${S}/.config'!"