Changeset 19590

Timestamp:

09/25/15 12:24:41 (9 years ago)

Author:

glperez

Message:

CHG: Fixed a bug with the patch.

File:

• issm/trunk-jpl/externalpackages/autotools/patches/libtool.m4.patch (modified) (3 diffs)

issm/trunk-jpl/externalpackages/autotools/patches/libtool.m4.patch

@@ -1 @@
---- ./externalpackages/autotools/install/share/aclocal/libtool.m4       2015-09-24 19:28:57.393566400 -0700
-+++ /home/daeden/tmp/libtool.m4 2015-09-25 11:30:45.133747600 -0700
+--- ./externalpackages/autotools/install/share/aclocal/libtool.m4       2015-09-25 12:22:44.498051700 -0700
++++ /home/daeden/tmp/libtool.m4 2015-09-25 12:24:23.070426400 -0700
 @@ -2382,7 +2382,7 @@
      # Native MSVC
@@ -44 +44 @@
 +       _LT_TAGVAR(archive_cmds, $1)='$CC /OUT:$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
         _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--           sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+           sed -n -e 's/\\\\\\\(.*\\\\\\\)/\/link\\\ \/EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+            sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
           else
--           sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+           sed -e 's/\\\\\\\(.*\\\\\\\)/\/link\\\ \/EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+            sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
           fi~
 -         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
@@ -55 +53 @@
         # The linker will not automatically build a static lib if we build a DLL.
         # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-@@ -6131,11 +6131,11 @@
-          # FIXME: Setting linknames here is a bad hack.
-          _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-+             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/\/link\\\ \/EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+@@ -6135,7 +6135,7 @@
             else
--             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-+             $SED -e 's/\\\\\\\(.*\\\\\\\)/\/link\\\ \/EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+              $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
             fi~
 -           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~