From 319fdbcb80a9a865737022182173311f42c4c2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 20 Dec 2020 18:35:58 -0300
Subject: [PATCH 1/2] common/wrappers/cross-cc: catch -L/lib in args.

Issue spotted while building geda.
---
 common/wrappers/cross-cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 618ccbea5675..cd0d4428d7c7 100644
--- a/common/wrappers/cross-cc
+++ b/common/wrappers/cross-cc
@@ -16,7 +16,7 @@ while [ $i -lt ${#ARGS[@]} ]; do
 		fi
 		unset incpath
 	elif [ "$libpath" ]; then
-		if [ "$arg" = "/usr/lib" ]; then
+		if [ "$arg" = "/usr/lib" -o "$arg" = "/lib" ]; then
 			echo "[cc-wrapper] ignoring -L $arg"
 		else
 			MYARGS+=("-L${arg}")
@@ -26,12 +26,12 @@ while [ $i -lt ${#ARGS[@]} ]; do
 		incpath=1
 	elif [ "$arg" = "-L" ]; then
 		libpath=1
-	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" ]; then
+	elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" -o "$arg" = "-L/lib" ]; then
 		echo "[cc-wrapper] ignoring $arg"
 	else
 		MYARGS+=("${arg}")
 	fi
 	i=$((i+1))
 done
-#echo "[cc-wrapper] @BIN@ ${MYARGS[@]}"
+echo "[cc-wrapper] @BIN@ ${MYARGS[@]}"
 exec @BIN@ "${MYARGS[@]}"

From 4fc361eb0e816df1161ed2f7f10c9d030f8cbdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 20 Dec 2020 18:45:08 -0300
Subject: [PATCH 2/2] geda: remove -L/lib workaround.

Now part of cross-cc wrapper.
---
 srcpkgs/geda/template | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 57b6592ce14d..2e920b2d89b7 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -28,13 +28,6 @@ pre_configure() {
 	autoreconf -fi
 }
 
-post_configure() {
-	# the build system somehow adds -L/lib to the makefiles,
-	# which breaks cross builds and is unnecessary for
-	# native builds. remove the flag
-	find . -name Makefile -exec sed s,-L/lib,, -i "{}" \;
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache
 }