- updated

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

diff --git a/libtool-linking-order.patch b/libtool-linking-order.patch
index f269eeab9600094de66674e87bbb6882c4fe8eb1..fbc812ea1d28ca8cb5e6078e137be40c70e33d99 100644 (file)
--- a/libtool-linking-order.patch
+++ b/libtool-linking-order.patch
@@ -125,19 +125,19 @@ 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
-@@ -5582,13 +5582,13 @@
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
+@@ -5741,13 +5741,13 @@
+       *)
+         tmp_sharedflag='-shared' ;;
        esac
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared'"$tmp_addflag"' $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
  
        if test $supports_anon_versioning = yes; then
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
    $echo "local: *; };" >> $output_objdir/$libname.ver~
--        $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        $CC $compiler_flags -shared'"$tmp_addflag"' $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-        $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        $CC $compiler_flags '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
        fi
        else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no

diff --git a/libtool.m4_cegcc.patch b/libtool.m4_cegcc.patch
index 8aad17205399fcedf86190411d2413d56398c8a3..faf9dc8fb63b07e8d5463e01e5af83711e8ce2d7 100644 (file)
--- a/libtool.m4_cegcc.patch
+++ b/libtool.m4_cegcc.patch
@@ -89,8 +89,8 @@
      beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
        # PIC is the default for these OSes.
        ;;
--    mingw* | os2* | pw32*)
-+    mingw* | os2* | pw32* | cegcc*)
+-    mingw* | cygwin* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32* | cegcc*)
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -98,8 +98,8 @@
        # PIC is the default for these OSes.
        ;;
  
--    mingw* | pw32* | os2*)
-+    mingw* | pw32* | os2* | cegcc*)
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -107,8 +107,8 @@
         esac
         ;;
  
--    mingw* | pw32* | os2*)
-+    mingw* | pw32* | os2* | cegcc*)
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -118,7 +118,7 @@
    ;;
 -  cygwin* | mingw*)
 +  cygwin* | mingw* | cegcc*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
    ;;
    *)
 @@ -5438,7 +5445,7 @@ ifelse([$1],[CXX],[