Don't use -nostdlib for C++ with GCC on Solaris. Bump revision of

libtool-base.

3 files changed, 125 insertions, 103 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 267c459d33b..6c713d6bf14 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.93 2014/05/11 13:23:03 taca Exp $
+$NetBSD: distinfo,v 1.94 2014/06/15 14:42:05 joerg 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) = cf6e8852b6c9eb04256904085f4ee6fefc470a02
+SHA1 (patch-ab) = ccb33a6e3075908ab7ecf56836349baec8ac85ca
 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 90d2e50ba57..a3d7cb13bd5 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,9 +1,7 @@
-$NetBSD: manual-libtool.m4,v 1.40 2014/05/10 15:32:08 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.41 2014/06/15 14:42:05 joerg Exp $
 
 --- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
---- libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
-+++ libtool.m4
 @@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
    esac
@@ -424,27 +422,39 @@ $NetBSD: manual-libtool.m4,v 1.40 2014/05/10 15:32:08 joerg Exp $
  	;;
  
        *nto* | *qnx*)
-@@ -6740,9 +6851,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6739,27 +6850,14 @@ if test "$_lt_caught_CXX_error" != yes; 
+ 	    # GNU C++ compiler with Solaris linker
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $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~
+-	        _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -shared $pic_flag -nostdlib ${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
-@@ -6751,9 +6862,9 @@ if test "$_lt_caught_CXX_error" != yes; 
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
+-
+-	        # Commands to make compiler produce verbose output that lists
+-	        # what "hidden" libraries, object files and flags are used when
+-	        # linking a shared library.
+-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+-	      else
+-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	        # platform.
 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $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~
+-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 -		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $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
+-	        # 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 $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 $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
++	      # linking a shared library.
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
  
- 	        # Commands to make compiler produce verbose output that lists
- 	        # what "hidden" libraries, object files and flags are used when
+ 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ 	      case $host_os in
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index e572b7adf3d..f40e42d6e3a 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
+$NetBSD: patch-ab,v 1.81 2014/06/15 14:42:05 joerg Exp $
 
---- configure.orig	2014-03-06 15:38:07.000000000 +0000
+--- configure.orig	2014-06-15 14:27:26.000000000 +0000
 +++ configure
 @@ -5335,7 +5335,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -426,31 +426,43 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  	;;
  
        *nto* | *qnx*)
-@@ -14853,9 +14961,9 @@ fi
+@@ -14852,27 +14960,14 @@ fi
+ 	    # GNU C++ compiler with Solaris linker
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
 -	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $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~
+-	        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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -shared $pic_flag -nostdlib ${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
-@@ -14864,9 +14972,9 @@ fi
- 	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	        # platform.
+-
+-	        # Commands to make compiler produce verbose output that lists
+-	        # what "hidden" libraries, object files and flags are used when
+-	        # linking a shared library.
+-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+-	      else
+-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	        # platform.
 -	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_cmds_CXX='$CC -G -nostdlib $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~
+-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 -		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $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
-@@ -15236,9 +15344,15 @@ lt_prog_compiler_static_CXX=
+-
+-	        # Commands to make compiler produce verbose output that lists
+-	        # what "hidden" libraries, object files and flags are used when
+-	        # 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 $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 $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
++	      # linking a shared library.
++	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ 
+ 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ 	      case $host_os in
+@@ -15236,9 +15331,15 @@ lt_prog_compiler_static_CXX=
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -467,7 +479,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -15316,6 +15430,9 @@ lt_prog_compiler_static_CXX=
+@@ -15316,6 +15417,9 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
@@ -477,7 +489,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -15513,6 +15630,9 @@ lt_prog_compiler_static_CXX=
+@@ -15513,6 +15617,9 @@ lt_prog_compiler_static_CXX=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -487,7 +499,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -16184,7 +16304,7 @@ dgux*)
+@@ -16184,7 +16291,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -496,7 +508,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16198,7 +16318,7 @@ freebsd* | dragonfly*)
+@@ -16198,7 +16305,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -505,7 +517,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -16221,13 +16341,24 @@ freebsd* | dragonfly*)
+@@ -16221,13 +16328,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -531,7 +543,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -16315,12 +16446,7 @@ interix[3-9]*)
+@@ -16315,12 +16433,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -545,7 +557,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16419,19 +16545,36 @@ fi
+@@ -16419,19 +16532,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -592,7 +604,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -16457,7 +16600,7 @@ newsos6)
+@@ -16457,7 +16587,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -601,7 +613,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16465,7 +16608,7 @@ openbsd*)
+@@ -16465,7 +16595,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -610,7 +622,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17039,7 +17182,10 @@ $RM -r conftest*
+@@ -17039,7 +17169,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -622,7 +634,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  
    GCC=$G77
    if test -n "$compiler"; then
-@@ -17131,9 +17277,16 @@ lt_prog_compiler_static_F77=
+@@ -17131,9 +17264,16 @@ lt_prog_compiler_static_F77=
        ;;
  
      darwin* | rhapsody*)
@@ -640,7 +652,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      haiku*)
-@@ -17161,6 +17314,13 @@ lt_prog_compiler_static_F77=
+@@ -17161,6 +17301,13 @@ lt_prog_compiler_static_F77=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -654,7 +666,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -17313,6 +17473,15 @@ lt_prog_compiler_static_F77=
+@@ -17313,6 +17460,15 @@ lt_prog_compiler_static_F77=
        esac
        ;;
  
@@ -670,7 +682,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -17388,6 +17557,9 @@ lt_prog_compiler_static_F77=
+@@ -17388,6 +17544,9 @@ lt_prog_compiler_static_F77=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -680,7 +692,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -17918,16 +18090,29 @@ _LT_EOF
+@@ -17918,16 +18077,29 @@ _LT_EOF
        fi
        ;;
  
@@ -716,7 +728,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
-@@ -18324,7 +18509,7 @@ fi
+@@ -18324,7 +18496,7 @@ fi
    allow_undefined_flag_F77="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -725,7 +737,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -18498,15 +18683,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -18498,15 +18670,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_F77=yes
        ;;
  
@@ -759,7 +771,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      newsos6)
-@@ -18518,6 +18716,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -18518,6 +18703,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -771,7 +783,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      openbsd*)
-@@ -19126,7 +19329,7 @@ dgux*)
+@@ -19126,7 +19316,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -780,7 +792,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -19140,7 +19343,7 @@ freebsd* | dragonfly*)
+@@ -19140,7 +19330,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -789,7 +801,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -19163,13 +19366,24 @@ freebsd* | dragonfly*)
+@@ -19163,13 +19353,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -815,7 +827,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -19257,12 +19471,7 @@ interix[3-9]*)
+@@ -19257,12 +19458,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -829,7 +841,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -19355,19 +19564,36 @@ fi
+@@ -19355,19 +19551,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -876,7 +888,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -19393,7 +19619,7 @@ newsos6)
+@@ -19393,7 +19606,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -885,7 +897,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19401,7 +19627,7 @@ openbsd*)
+@@ -19401,7 +19614,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -894,7 +906,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19966,7 +20192,10 @@ $RM -r conftest*
+@@ -19966,7 +20179,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -906,7 +918,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  
  
    if test -n "$compiler"; then
-@@ -20203,9 +20432,16 @@ lt_prog_compiler_static_FC=
+@@ -20203,9 +20419,16 @@ lt_prog_compiler_static_FC=
        ;;
  
      darwin* | rhapsody*)
@@ -924,7 +936,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      haiku*)
-@@ -20233,6 +20469,13 @@ lt_prog_compiler_static_FC=
+@@ -20233,6 +20456,13 @@ lt_prog_compiler_static_FC=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -938,7 +950,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -20385,6 +20628,15 @@ lt_prog_compiler_static_FC=
+@@ -20385,6 +20615,15 @@ lt_prog_compiler_static_FC=
        esac
        ;;
  
@@ -954,7 +966,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_FC='-KPIC'
        lt_prog_compiler_static_FC='-Bstatic'
-@@ -20460,6 +20712,9 @@ lt_prog_compiler_static_FC=
+@@ -20460,6 +20699,9 @@ lt_prog_compiler_static_FC=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -964,7 +976,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -20990,16 +21245,29 @@ _LT_EOF
+@@ -20990,16 +21232,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1000,7 +1012,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_FC=no
-@@ -21396,7 +21664,7 @@ fi
+@@ -21396,7 +21651,7 @@ fi
    allow_undefined_flag_FC="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -1009,7 +1021,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -21570,15 +21838,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -21570,15 +21825,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_FC=yes
        ;;
  
@@ -1043,7 +1055,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      newsos6)
-@@ -21590,6 +21871,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -21590,6 +21858,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1055,7 +1067,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      openbsd*)
-@@ -22198,7 +22484,7 @@ dgux*)
+@@ -22198,7 +22471,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1064,7 +1076,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -22212,7 +22498,7 @@ freebsd* | dragonfly*)
+@@ -22212,7 +22485,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -1073,7 +1085,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -22235,13 +22521,24 @@ freebsd* | dragonfly*)
+@@ -22235,13 +22508,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -1099,7 +1111,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -22329,12 +22626,7 @@ interix[3-9]*)
+@@ -22329,12 +22613,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -1113,7 +1125,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -22427,19 +22719,36 @@ fi
+@@ -22427,19 +22706,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1160,7 +1172,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -22465,7 +22774,7 @@ newsos6)
+@@ -22465,7 +22761,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -1169,7 +1181,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -22473,7 +22782,7 @@ openbsd*)
+@@ -22473,7 +22769,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -1178,7 +1190,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -22883,7 +23192,10 @@ for cc_temp in $compiler""; do
+@@ -22883,7 +23179,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1190,7 +1202,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  
  
  # Go did not exist at the time GCC didn't implicitly link libc in.
-@@ -23003,9 +23315,16 @@ lt_prog_compiler_static_GO=
+@@ -23003,9 +23302,16 @@ lt_prog_compiler_static_GO=
        ;;
  
      darwin* | rhapsody*)
@@ -1208,7 +1220,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      haiku*)
-@@ -23033,6 +23352,13 @@ lt_prog_compiler_static_GO=
+@@ -23033,6 +23339,13 @@ lt_prog_compiler_static_GO=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1222,7 +1234,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -23185,6 +23511,15 @@ lt_prog_compiler_static_GO=
+@@ -23185,6 +23498,15 @@ lt_prog_compiler_static_GO=
        esac
        ;;
  
@@ -1238,7 +1250,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_GO='-KPIC'
        lt_prog_compiler_static_GO='-Bstatic'
-@@ -23260,6 +23595,9 @@ lt_prog_compiler_static_GO=
+@@ -23260,6 +23582,9 @@ lt_prog_compiler_static_GO=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1248,7 +1260,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_GO=
      ;;
-@@ -23790,16 +24128,29 @@ _LT_EOF
+@@ -23790,16 +24115,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1284,7 +1296,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GO=no
-@@ -24208,7 +24559,7 @@ fi
+@@ -24208,7 +24546,7 @@ fi
    allow_undefined_flag_GO="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -1293,7 +1305,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -24381,15 +24732,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -24381,15 +24719,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_GO=yes
        ;;
  
@@ -1327,7 +1339,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      newsos6)
-@@ -24401,6 +24765,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -24401,6 +24752,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1339,7 +1351,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      openbsd*)
-@@ -24980,7 +25349,10 @@ for cc_temp in $compiler""; do
+@@ -24980,7 +25336,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1351,7 +1363,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -25100,9 +25472,16 @@ lt_prog_compiler_static_GCJ=
+@@ -25100,9 +25459,16 @@ lt_prog_compiler_static_GCJ=
        ;;
  
      darwin* | rhapsody*)
@@ -1369,7 +1381,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      haiku*)
-@@ -25130,6 +25509,13 @@ lt_prog_compiler_static_GCJ=
+@@ -25130,6 +25496,13 @@ lt_prog_compiler_static_GCJ=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1383,7 +1395,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -25282,6 +25668,15 @@ lt_prog_compiler_static_GCJ=
+@@ -25282,6 +25655,15 @@ lt_prog_compiler_static_GCJ=
        esac
        ;;
  
@@ -1399,7 +1411,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -25357,6 +25752,9 @@ lt_prog_compiler_static_GCJ=
+@@ -25357,6 +25739,9 @@ lt_prog_compiler_static_GCJ=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1409,7 +1421,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -25887,16 +26285,29 @@ _LT_EOF
+@@ -25887,16 +26272,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1445,7 +1457,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
-@@ -26305,7 +26716,7 @@ fi
+@@ -26305,7 +26703,7 @@ fi
    allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -1454,7 +1466,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -26478,15 +26889,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26478,15 +26876,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -1488,7 +1500,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      newsos6)
-@@ -26498,6 +26922,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26498,6 +26909,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1500,7 +1512,7 @@ $NetBSD: patch-ab,v 1.80 2014/05/10 15:32:08 joerg Exp $
        ;;
  
      openbsd*)
-@@ -27075,7 +27504,10 @@ for cc_temp in $compiler""; do
+@@ -27075,7 +27491,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done