[gentoo-commits] proj/elt-patches:master commit in: patches/as-needed/

[gentoo-commits] proj/elt-patches:master commit in: patches/as-needed/

[Sam James]

commit:     fe4a525450df9a37856289150733924781152fd1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  6 22:15:38 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  6 22:15:38 2025 +0000
URL:        https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=fe4a5254

patches: as-needed: add references

Signed-off-by: Sam James <sam <AT> gentoo.org>

 patches/as-needed/1.5    | 2 ++
 patches/as-needed/1.5.26 | 2 ++
 patches/as-needed/2.2.6  | 2 ++
 patches/as-needed/2.4.2  | 2 ++
 patches/as-needed/2.4.3  | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/patches/as-needed/1.5 b/patches/as-needed/1.5
index 01759c9..aae999c 100644
--- a/patches/as-needed/1.5
+++ b/patches/as-needed/1.5
@@ -1,3 +1,5 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
 --- ltmain.sh.orig	2006-03-29 15:45:36.000000000 +0200
 +++ ltmain.sh	2006-03-29 16:39:30.000000000 +0200
 @@ -1754,6 +1754,11 @@

diff --git a/patches/as-needed/1.5.26 b/patches/as-needed/1.5.26
index 6836c55..a768d81 100644
--- a/patches/as-needed/1.5.26
+++ b/patches/as-needed/1.5.26
@@ -1,3 +1,5 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
 --- ltmain.sh.orig	2009-04-18 16:51:52.000000000 +0200
 +++ ltmain.sh	2009-04-18 16:55:05.000000000 +0200
 @@ -1812,10 +1812,15 @@

diff --git a/patches/as-needed/2.2.6 b/patches/as-needed/2.2.6
index 7e71de4..d1c47dc 100644
--- a/patches/as-needed/2.2.6
+++ b/patches/as-needed/2.2.6
@@ -1,3 +1,5 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
 --- ltmain.sh.orig	2009-04-18 14:37:16.000000000 +0200
 +++ ltmain.sh	2009-04-18 14:40:08.000000000 +0200
 @@ -4721,10 +4721,15 @@

diff --git a/patches/as-needed/2.4.2 b/patches/as-needed/2.4.2
index 526877a..73e7b7f 100644
--- a/patches/as-needed/2.4.2
+++ b/patches/as-needed/2.4.2
@@ -1,3 +1,5 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
 --- ltmain.sh.orig	2012-08-19 10:18:57.929178597 +0200
 +++ ltmain.sh	2012-08-19 10:31:43.409388998 +0200
 @@ -5798,10 +5798,15 @@

diff --git a/patches/as-needed/2.4.3 b/patches/as-needed/2.4.3
index a31e9ed..f57b3e2 100644
--- a/patches/as-needed/2.4.3
+++ b/patches/as-needed/2.4.3
@@ -1,3 +1,5 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
 --- ltmain.sh
 +++ ltmain.sh
 @@ -7225,10 +7225,15 @@

[gentoo-commits] proj/elt-patches:master commit in: patches/as-needed/

[Sam James]

commit:     af4893f10cca1b87433be499025bb8bf0a267b6e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  6 23:42:33 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  6 23:44:55 2025 +0000
URL:        https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=af4893f1

patches: as-needed: add 2.5.0

This stopped applying with my own 888bd7ad44fce8a2d4e9bc720c8bb8234bc10df4
(see also d3c77e47d0c2ae8806b340aabb53947012c239f5).

It showed up in media-libs/libwmf in meson's CI where ICU wasn't pulled
in as a binpkg as it was only needed via libxml2 but it being greedily
linked with -Wl,--as-needed not applying. libwmf has its own issues
fixed in git (and really needs a new release) but that's another matter,
this shows up with e.g. libwebp when modifying it to force ICU linkage
too as a random test.

Thanks-to: Eli Schwartz <eschwartz <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 patches/as-needed/2.5.0 | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/patches/as-needed/2.5.0 b/patches/as-needed/2.5.0
new file mode 100644
index 0000000..c91af6f
--- /dev/null
+++ b/patches/as-needed/2.5.0
@@ -0,0 +1,32 @@
+http://lists.gnu.org/archive/html/bug-libtool/2009-12/msg00038.html
+https://bugs.debian.org/347650
+--- ltmain.sh
++++ ltmain.sh
+@@ -7648,6 +7648,11 @@ func_mode_link ()
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed|-Wl,--no-as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -8070,6 +8075,15 @@ func_mode_link ()
+ 	lib=
+ 	found=false
+ 	case $deplib in
++	-Wl,--as-needed|-Wl,--no-as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	continue
++	;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	  if test prog,link = "$linkmode,$pass"; then