[PR PATCH] common/wrappers/cross-cc: catch -L/lib in args.

[PR PATCH] common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages wrapper
https://github.com/void-linux/void-packages/pull/27314

common/wrappers/cross-cc: catch -L/lib in args.
Issue spotted while building geda.

A patch file from https://github.com/void-linux/void-packages/pull/27314.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wrapper-27314.patch --]
[-- Type: text/x-diff, Size: 790 bytes --]

From 17ff3b3f3590c4d9bbd02b07ac5200e5cf07afb8 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] common/wrappers/cross-cc: catch -L/lib in args.

Issue spotted while building geda.
---
 common/wrappers/cross-cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 618ccbea567..551bc3711d0 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" ] || [ "$arg" = "/lib" ]; then
 			echo "[cc-wrapper] ignoring -L $arg"
 		else
 			MYARGS+=("-L${arg}")

Re: [PR PATCH] [Updated] common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages wrapper
https://github.com/void-linux/void-packages/pull/27314

common/wrappers/cross-cc: catch -L/lib in args.
Issue spotted while building geda.

A patch file from https://github.com/void-linux/void-packages/pull/27314.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wrapper-27314.patch --]
[-- Type: text/x-diff, Size: 1637 bytes --]

From 17ff3b3f3590c4d9bbd02b07ac5200e5cf07afb8 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 618ccbea567..551bc3711d0 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" ] || [ "$arg" = "/lib" ]; then
 			echo "[cc-wrapper] ignoring -L $arg"
 		else
 			MYARGS+=("-L${arg}")

From 743e9d7328cdaf01a1fb45d957672d7afd429b6c 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 57b6592ce14..2e920b2d89b 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
 }

Re: common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27314#issuecomment-748676056

Comment:
I tested this wrong, it seems.

Re: [PR PATCH] [Updated] common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages wrapper
https://github.com/void-linux/void-packages/pull/27314

common/wrappers/cross-cc: catch -L/lib in args.
Issue spotted while building geda.

A patch file from https://github.com/void-linux/void-packages/pull/27314.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wrapper-27314.patch --]
[-- Type: text/x-diff, Size: 2108 bytes --]

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
 }

Re: [PR PATCH] [Updated] common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages wrapper
https://github.com/void-linux/void-packages/pull/27314

common/wrappers/cross-cc: catch -L/lib in args.
Issue spotted while building geda.

A patch file from https://github.com/void-linux/void-packages/pull/27314.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wrapper-27314.patch --]
[-- Type: text/x-diff, Size: 1972 bytes --]

From 165e24d372218c0901f7d33572df0bbc77c73182 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/wrappers/cross-cc b/common/wrappers/cross-cc
index 618ccbea5675..f5333a03bb2f 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,7 +26,7 @@ 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}")

From 02715df614198e559eae7fe5be2abfb49013956f 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
 }

Re: common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27314#issuecomment-748677538

Comment:
Should be working now.

Re: [PR PATCH] [Merged]: common/wrappers/cross-cc: catch -L/lib in args.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

There's a merged pull request on the void-packages repository

common/wrappers/cross-cc: catch -L/lib in args.
https://github.com/void-linux/void-packages/pull/27314

Description:
Issue spotted while building geda.