old

(Portage version: 2.2_pre5)

2 files changed, 0 insertions, 148 deletions

diff --git a/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch b/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch
deleted file mode 100644
index 119f6ed63778..000000000000
--- a/sys-devel/libtool/files/libtool-2.2.2-AC_LIBLTDL_CONVENIENCE.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 9b00a3a6e7d231440029d8be120dff7faa15320e
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Tue Apr 22 21:32:32 2008 +0200
-
-    Fix default argument for AC_LIBLTDL_CONVENIENCE.
-    
-    * libltdl/m4/ltdl.m4 (AC_LIBLTDL_CONVENIENCE): Default argument
-    to libltdl.
-    (AC_LIBLTDL_INSTALLABLE): Likewise.
-    * tests/configure-iface.at (convenience libltdl): New test.
-    
-    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
-diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
-index bdecc9d..f6b1064 100644
---- a/libltdl/m4/ltdl.m4
-+++ b/libltdl/m4/ltdl.m4
-@@ -79,7 +79,7 @@ _$0()
- # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
- # now we have LT_CONFIG_LTDL_DIR:
- AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[_LT_CONFIG_LTDL_DIR([$1])
-+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
- _LTDL_CONVENIENCE])
- 
- dnl aclocal-1.4 backwards compatibility:
-@@ -135,7 +135,7 @@ _$0()
- # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
- # now we have LT_CONFIG_LTDL_DIR:
- AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
--[_LT_CONFIG_LTDL_DIR([$1])
-+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
- _LTDL_INSTALLABLE])
- 
- dnl aclocal-1.4 backwards compatibility:
-diff --git a/tests/configure-iface.at b/tests/configure-iface.at
-index 3fcb0da..9a311dc 100644
---- a/tests/configure-iface.at
-+++ b/tests/configure-iface.at
-@@ -275,5 +275,33 @@ AT_CHECK([$MAKE -q main$EXEEXT || exit 1], [1], [ignore], [ignore])
- 
- AT_CLEANUP
- 
-+
-+## -------------------- ##
-+## Convenience libltdl. ##
-+## -------------------- ##
-+
-+AT_SETUP([convenience libltdl])
-+
-+AT_DATA([configure.ac],
-+[[AC_INIT
-+AC_CONFIG_AUX_DIR([libltdl/config])
-+AC_LIBLTDL_CONVENIENCE
-+AC_LIBTOOL_DLOPEN
-+AC_PROG_LIBTOOL
-+AC_CONFIG_FILES(Makefile)
-+AC_OUTPUT
-+]])
-+AT_DATA([Makefile.in],
-+[[LIBLTDL = @LIBLTDL@
-+print-ltdl:
-+	echo $(LIBLTDL)
-+]])
-+
-+LT_AT_BOOTSTRAP([--ltdl], [-I libltdl/m4], [ignore], [ignore], [], [], [ignore])
-+AT_CHECK([$MAKE print-ltdl], [], [stdout])
-+AT_CHECK([grep libltdl/libltdlc.la stdout], [], [ignore])
-+
-+AT_CLEANUP
-+
- dnl Be careful not to let the definition leak into other tests
- m4_popdef([_LT_AT_LTDL_SETUP])
diff --git a/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch b/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch
deleted file mode 100644
index 074a41cd4d0e..000000000000
--- a/sys-devel/libtool/files/libtool-2.2.2-flag-order.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-http://lists.gnu.org/archive/html/libtool/2008-04/msg00122.html
-
-commit 9c3ae35db6bbd9ce82bc5479354d99f53c46e888
-Author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-Date:   Tue Apr 22 21:43:06 2008 +0200
-
-    Fix regression over 1.5.26 with ccache $CC -all-static.
-    
-    * libltdl/config/ltmain.m4sh (func_mode_link): Add
-    $link_static_flag to compile_command and link_command only
-    later, instead of right after a possible compiler wrapper.
-    * tests/static.at (ccache -all-static): New test.
-    * THANKS: Update.
-    Report by Richard Purdie.
-    
-    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-
-diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
-index ff1e50d..ac334dc 100644
---- a/libltdl/config/ltmain.m4sh
-+++ b/libltdl/config/ltmain.m4sh
-@@ -3160,9 +3160,6 @@ func_mode_link ()
- 	  fi
- 	  if test -n "$link_static_flag"; then
- 	    dlopen_self=$dlopen_self_static
--	    # See comment for -static flag below, for more details.
--	    func_append compile_command " $link_static_flag"
--	    func_append finalize_command " $link_static_flag"
- 	  fi
- 	  prefer_static_libs=yes
- 	  ;;
-@@ -3450,7 +3447,11 @@ func_mode_link ()
- 
-       case $arg in
-       -all-static)
--	# The effects of -all-static are defined in a previous loop.
-+	if test -n "$link_static_flag"; then
-+	  # See comment for -static flag below, for more details.
-+	  func_append compile_command " $link_static_flag"
-+	  func_append finalize_command " $link_static_flag"
-+	fi
- 	continue
- 	;;
- 
-diff --git a/tests/static.at b/tests/static.at
-index 74b1c63..1a51d0d 100644
---- a/tests/static.at
-+++ b/tests/static.at
-@@ -352,3 +352,26 @@ for withdep in no yes; do
- done
- 
- AT_CLEANUP
-+
-+
-+AT_SETUP([ccache -all-static])
-+
-+AT_DATA([ccache],
-+[[#! /bin/sh
-+# poor man's ccache clone
-+case $1 in
-+-*) echo "bogus argument: $1" >&2; exit 1 ;;
-+esac
-+exec "$@"
-+]])
-+chmod +x ./ccache
-+
-+AT_DATA([a.c],
-+[[int main(void) { return 0; }
-+]])
-+
-+AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c], [], [ignore])
-+AT_CHECK([$LIBTOOL --mode=link --tag=CC ./ccache $CC $CFLAGS $LDFLAGS -all-static a.$OBJEXT -o a],
-+	 [], [ignore])
-+
-+AT_CLEANUP