- updated for 1.5.26

Changed files:
    libtool-linking-order.patch -> 1.3

diff --git a/libtool-linking-order.patch b/libtool-linking-order.patch
index fbc812ea1d28ca8cb5e6078e137be40c70e33d99..88bcea4bf6fbac38e0162667a3acf9d6f54ac29d 100644 (file)
--- a/libtool-linking-order.patch
+++ b/libtool-linking-order.patch
@@ -1,7 +1,6 @@
-diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
---- libtool-1.5.22.orig/libtool.m4     2006-08-04 20:55:04.000000000 +0200
-+++ libtool-1.5.22.linking-order/libtool.m4    2006-08-04 21:20:42.000000000 +0200
-@@ -2855,8 +2855,8 @@
+--- libtool-1.5.26/libtool.m4.orig     2008-02-09 00:07:39.322803730 +0100
++++ libtool-1.5.26/libtool.m4  2008-02-09 00:31:42.977072898 +0100
+@@ -2988,8 +2988,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -12,7 +11,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2882,7 +2882,7 @@
+@@ -3015,7 +3015,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -21,7 +20,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -2996,12 +2996,12 @@
+@@ -3129,12 +3129,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -36,7 +35,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        else
        # Determine the default libpath from the value encoded in an empty executable.
        _LT_AC_SYS_LIBPATH_AIX
-@@ -3014,7 +3014,7 @@
+@@ -3147,7 +3147,7 @@
        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
        # This is similar to how AIX traditionally builds its shared libraries.
@@ -45,7 +44,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        fi
      fi
      ;;
-@@ -3024,7 +3024,7 @@
+@@ -3157,7 +3157,7 @@
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
        # support --undefined.  This deserves some investigation.  FIXME
@@ -54,7 +53,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -3048,7 +3048,7 @@
+@@ -3181,7 +3181,7 @@
      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
@@ -63,7 +62,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -3057,7 +3057,7 @@
+@@ -3190,7 +3190,7 @@
        echo EXPORTS > $output_objdir/$soname.def;
        cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -72,19 +71,16 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -3096,9 +3096,9 @@
-        lt_int_apple_cc_single_mod=yes
+@@ -3210,7 +3210,7 @@
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+       _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC \$compiler_flags -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
        fi
-       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs -install_name $rpath/$soname $verstring'
        else
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs -install_name $rpath/$soname $verstring'
-         fi
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-         # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-@@ -3343,16 +3343,16 @@
+@@ -3446,16 +3446,16 @@
        # earlier do not add the objects themselves.
        case `$CC -V 2>&1` in
        *"Version 7."*)
@@ -105,7 +101,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
          ;;
        esac
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -3371,8 +3371,8 @@
+@@ -3474,8 +3474,8 @@
          ;;
        cxx*)
        # Compaq C++
@@ -116,7 +112,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
  
        runpath_var=LD_RUN_PATH
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5518,7 +5518,7 @@
+@@ -5740,7 +5740,7 @@
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
        # support --undefined.  This deserves some investigation.  FIXME
@@ -125,7 +121,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5741,13 +5741,13 @@
+@@ -5813,13 +5813,13 @@
        *)
          tmp_sharedflag='-shared' ;;
        esac
@@ -141,7 +137,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        fi
        else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5600,8 +5600,8 @@
+@@ -5831,8 +5831,8 @@
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
        wlarc=
        else
@@ -152,7 +148,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        fi
        ;;
  
-@@ -5619,8 +5619,8 @@
+@@ -5850,8 +5850,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -163,7 +159,7 @@ diff -Nur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22.linking-order/libtool.m4
        else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -5662,8 +5662,8 @@
+@@ -5893,8 +5893,8 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then