revert libtool

4 files changed, 19 insertions, 51 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 5a7d0abd455..b655dc6346e 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.96 2014/09/10 10:14:07 richard Exp $
+$NetBSD: distinfo,v 1.97 2014/09/10 10:44:58 richard Exp $
 
 SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 4bf7e3391791a1dda353d4abf3290e4c87be1f9a
-SHA1 (patch-ac) = b41459989ea1fbd906e48ac0a9948661b4a466ca
+SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda
+SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
 SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 3fe2e96d1d4..c2b72d8eed6 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.43 2014/09/10 10:14:07 richard Exp $
+$NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
 
 --- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
@@ -447,9 +447,9 @@ $NetBSD: manual-libtool.m4,v 1.43 2014/09/10 10:14:07 richard Exp $
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      fi
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	      # Commands to make compiler produce verbose output that lists
 +	      # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 4a5e8a09f9f..0285560a135 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.83 2014/09/10 10:14:07 richard Exp $
+$NetBSD: patch-ab,v 1.84 2014/09/10 10:44:58 richard Exp $
 
 --- configure.orig	2011-10-17 10:18:58.000000000 +0000
 +++ configure
@@ -451,9 +451,9 @@ $NetBSD: patch-ab,v 1.83 2014/09/10 10:14:07 richard Exp $
 -	        # linking a shared library.
 -	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -	      fi
-+	      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
++	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 +	      archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	      # Commands to make compiler produce verbose output that lists
 +	      # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 214be10f167..a5dbf3bec41 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,12 +1,6 @@
-$NetBSD: patch-ac,v 1.32 2014/09/10 10:14:07 richard Exp $
+$NetBSD: patch-ac,v 1.33 2014/09/10 10:44:58 richard Exp $
 
-Add passthrough support for -fstack-protector*
-http://permalink.gmane.org/gmane.comp.gnu.libtool.bugs/7341
-
-Disable the opt_duplicate_compiler_generated_deps optimisation
-for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-
---- libltdl/config/ltmain.sh.orig	2011-10-17 10:19:35.000000000 +0000
+--- libltdl/config/ltmain.sh.orig	Mon Oct 17 10:19:11 2011
 +++ libltdl/config/ltmain.sh
 @@ -133,8 +133,9 @@ $lt_unset CDPATH
  # function.
@@ -20,34 +14,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  : ${CP="cp -f"}
  test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
  : ${MAKE="make"}
-@@ -1180,7 +1181,9 @@ func_enable_tag "$optarg"
-   test "$opt_debug" = : || func_append preserve_args " --debug"
- 
-   case $host in
--    *cygwin* | *mingw* | *pw32* | *cegcc*)
-+    # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=1645
-+    # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-+    *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
-       # don't eliminate duplications in $postdeps and $predeps
-       opt_duplicate_compiler_generated_deps=:
-       ;;
-@@ -5847,13 +5850,14 @@ func_mode_link ()
-       # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-       # -F/path              path to uninstalled frameworks, gcc on darwin
-       # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-+      # -fstack-protector*   stack protector flags for GCC
-       # @file                GCC response files
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-@@ -7391,6 +7395,7 @@ func_mode_link ()
+@@ -7391,6 +7392,7 @@ func_mode_link ()
  	# Calculate the version variables.
  	major=
  	versuffix=
@@ -55,7 +22,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	verstring=
  	case $version_type in
  	none) ;;
-@@ -7451,6 +7456,7 @@ func_mode_link ()
+@@ -7451,6 +7453,7 @@ func_mode_link ()
  	  func_arith $current - $age
  	  major=.$func_arith_result
  	  versuffix="$major.$age.$revision"
@@ -63,7 +30,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	  ;;
  
  	osf)
-@@ -7511,8 +7517,10 @@ func_mode_link ()
+@@ -7511,8 +7514,10 @@ func_mode_link ()
  	  esac
  	  if test "$need_version" = no; then
  	    versuffix=
@@ -74,7 +41,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	  fi
  	fi
  
-@@ -7520,6 +7528,7 @@ func_mode_link ()
+@@ -7520,6 +7525,7 @@ func_mode_link ()
  	if test "$avoid_version" = yes && test "$need_version" = no; then
  	  major=
  	  versuffix=
@@ -82,7 +49,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	  verstring=""
  	fi
  
-@@ -7630,7 +7639,7 @@ func_mode_link ()
+@@ -7630,7 +7636,7 @@ func_mode_link ()
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -91,7 +58,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	    # Do not include libc due to us having libc/libc_r.
  	    ;;
  	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -7653,12 +7662,14 @@ func_mode_link ()
+@@ -7653,6 +7659,7 @@ func_mode_link ()
  	libname_save=$libname
  	release_save=$release
  	versuffix_save=$versuffix
@@ -99,6 +66,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	major_save=$major
  	# I'm not sure if I'm treating the release correctly.  I think
  	# release should show up in the -l (ie -lgmp5) so we don't want to
+@@ -7659,6 +7666,7 @@ func_mode_link ()
  	# add it in twice.  Is that correct?
  	release=""
  	versuffix=""
@@ -106,7 +74,7 @@ for solaris2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  	major=""
  	newdeplibs=
  	droppeddeps=no
-@@ -7935,6 +7946,7 @@ EOF
+@@ -7935,6 +7943,7 @@ EOF
  	  ;;
  	esac
  	versuffix=$versuffix_save