diff options
| author | Allan McRae <allan@archlinux.org> | 2020-01-16 12:20:19 +0100 |
|---|---|---|
| committer | Andrew Gregory <andrew@archlinux.org> | 2020-06-18 10:39:14 +0200 |
| commit | 0d0a4bd68099596ba17b8c314664484c3819fbf3 (patch) | |
| tree | 6925c7b988372307e9c30928ca1162171149f6b5 | |
| parent | 76c50e34393d68a740f825a6af9df8b7ac677303 (diff) | |
| download | pacman-0d0a4bd68099596ba17b8c314664484c3819fbf3.tar.gz pacman-0d0a4bd68099596ba17b8c314664484c3819fbf3.tar.xz | |
Remove unneeded ltmain patch
Many moons ago, libtool was bad - I mean worse than today! It gobbled all
--as-needed and we ended up with an overlinked libalpm. This was annoying,
particularly when dealing with soname bumps in libraries pacman/libalpm had
no business linking to. Luckily we had a fix, stolen from GNOME I believe.
And with that fix, we lived in harmony with libtool for many years. Until one
day, unbeknownst to us, libtool was "fixed". We kept applying our patch,
because it still applied, but it did worse than nothing. It gobbled up our
other LDFLAGS, and our libalpm started missing out on RELRO and BIND_NOW.
This made the Arch Security Team unhappy. We will make them happy again by
stopping the patch.
Signed-off-by: Allan McRae <allan@archlinux.org>
(cherry picked from commit 2e32d51a262fef398a94a17c0a0d4ff3233990b5)
[Andrew: restore autogen.sh]
| -rwxr-xr-x | autogen.sh | 1 | ||||
| -rw-r--r-- | build-aux/ltmain-asneeded.patch | 33 |
2 files changed, 0 insertions, 34 deletions
@@ -1,6 +1,5 @@ #!/bin/sh -x autoreconf -i -patch -d build-aux -Np0 -i ltmain-asneeded.patch exit 0 diff --git a/build-aux/ltmain-asneeded.patch b/build-aux/ltmain-asneeded.patch deleted file mode 100644 index af5ae6b2..00000000 --- a/build-aux/ltmain-asneeded.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ltmain.sh.orig 2013-06-26 14:31:53.472627840 +1000 -+++ ltmain.sh 2013-06-26 14:30:56.137038936 +1000 -@@ -5800,6 +5800,14 @@ - arg=$func_stripname_result - ;; - -+ -Wl,*--as-needed*) -+ deplibs="$deplibs $wl--as-needed" -+ ;; -+ -+ -Wl,*--no-as-needed*) -+ deplibs="$deplibs $wl--no-as-needed" -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6160,6 +6168,15 @@ - lib= - found=no - 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|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then |