Author: qboosh Date: Thu Mar 13 20:01:58 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- for mingw32 place compiler/linker flags between objects and deplibs (linker
flags are sometimes used to inject static library which libtool refuses when
linking DLL
---- Files affected:
SOURCES:
libtool-linking-order.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/libtool-linking-order.patch
diff -u SOURCES/libtool-linking-order.patch:1.4
SOURCES/libtool-linking-order.patch:1.5
--- SOURCES/libtool-linking-order.patch:1.4 Sat Mar 8 17:41:20 2008
+++ SOURCES/libtool-linking-order.patch Thu Mar 13 21:01:52 2008
@@ -5,7 +5,7 @@
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared $libobjs
$deplibs -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $compiler_flags
$deplibs -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
@@ -14,7 +14,7 @@
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs
$compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base
-Xlinker --out-implib -Xlinker $lib'
-+ $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs
$deplibs -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $compiler_flags
$deplibs -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker
--out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -130,7 +130,7 @@
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $compiler_flags $deplibs $postdep_objects -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
@@ -139,7 +139,7 @@
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+ $CC -shared -nostdlib $compiler_flags $output_objdir/$soname.def
$predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects
$libobjs $compiler_flags $deplibs $postdep_objects -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool-linking-order.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
