[pacman-dev] [PATCH] Remove unneeded ltmain patch

[Allan McRae]

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 at archlinux.org>
---
 autogen.sh                      |  6 ------
 build-aux/ltmain-asneeded.patch | 33 ---------------------------------
 2 files changed, 39 deletions(-)
 delete mode 100755 autogen.sh
 delete mode 100644 build-aux/ltmain-asneeded.patch

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 18fa641d..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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
-- 
2.25.0