Author: qboosh Date: Sat Mar 8 16:41:25 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.2
---- Files affected:
SOURCES:
libtool-libdirs.patch (1.1 -> 1.2) , libtool-linking-order.patch (1.3 ->
1.4) , libtool-multilib.patch (1.4 -> 1.5) , libtool-relink.patch (1.7 -> 1.8)
, libtool.m4_cegcc.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/libtool-libdirs.patch
diff -u SOURCES/libtool-libdirs.patch:1.1 SOURCES/libtool-libdirs.patch:1.2
--- SOURCES/libtool-libdirs.patch:1.1 Sun Apr 20 12:51:10 2003
+++ SOURCES/libtool-libdirs.patch Sat Mar 8 17:41:20 2008
@@ -1,5 +1,5 @@
---- libtool-1.5/libtool.m4.orig 2003-04-14 23:58:23.000000000 +0200
-+++ libtool-1.5/libtool.m4 2003-04-20 12:22:06.000000000 +0200
+--- libtool-2.2/libltdl/m4/libtool.m4.orig 2003-04-14 23:58:23.000000000
+0200
++++ libtool-2.2/libltdl/m4/libtool.m4 2003-04-20 12:22:06.000000000 +0200
@@ -1103,6 +1103,21 @@
else
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e
"s/$PATH_SEPARATOR/ /g"`
================================================================
Index: SOURCES/libtool-linking-order.patch
diff -u SOURCES/libtool-linking-order.patch:1.3
SOURCES/libtool-linking-order.patch:1.4
--- SOURCES/libtool-linking-order.patch:1.3 Sat Feb 9 01:28:44 2008
+++ SOURCES/libtool-linking-order.patch Sat Mar 8 17:41:20 2008
@@ -1,172 +1,249 @@
---- 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
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
-nostdlib $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -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.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
-@@ -3129,12 +3129,12 @@
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec,
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o
$output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"'
$compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo
"${wl}${allow_undefined_flag}"; else :; fi`
'"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' $compiler_flags -o
$output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' `if test
"x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}";
else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R
$libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"'
$compiler_flags ${wl}${allow_undefined_flag}
'"\${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"'
$compiler_flags -o $output_objdir/$soname $libobjs $deplibs
'"\${wl}$no_entry_flag"' ${wl}${allow_undefined_flag}
'"\${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty
executable.
- _LT_AC_SYS_LIBPATH_AIX
-@@ -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.
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o
$output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags
${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"'
$compiler_flags -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry
${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS
$output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-@@ -3157,7 +3157,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <[EMAIL PROTECTED]> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -nostart $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-@@ -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
-- _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared -nostdlib
$predep_objects $libobjs $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_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q
$export_symbols`" = xEXPORTS; then
-@@ -3190,7 +3190,7 @@
- echo EXPORTS > $output_objdir/$soname.def;
- 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 $compiler_flags -shared -nostdlib $output_objdir/$soname.def
$predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname
${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-@@ -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
- else
-@@ -3446,16 +3446,16 @@
- # earlier do not add the objects themselves.
- case `$CC -V 2>&1` in
- *"Version 7."*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
- case $host_cpu in
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"'
$libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags
-shared'"$tmp_idyn"' $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags
-shared'"$tmp_idyn"' $libobjs $deplibs ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- ;;
+--- libtool-2.2/libltdl/m4/libtool.m4.orig 2008-03-08 16:27:45.500328028
+0100
++++ libtool-2.2/libltdl/m4/libtool.m4 2008-03-08 16:52:29.192878848 +0100
+@@ -4306,7 +4306,7 @@
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience |
$global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1
DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq >
$export_symbols'
+
+ 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'
+ # 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
+@@ -4315,7 +4315,7 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ 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'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -4374,13 +4374,13 @@
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
esac
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -3474,8 +3474,8 @@
- ;;
- cxx*)
- # Compaq C++
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib ${wl}-retain-symbols-file $wl$export_symbols'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib ${wl}-retain-symbols-file $wl$export_symbols'
-
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5740,7 +5740,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Joseph Beckenbach <[EMAIL PROTECTED]> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -nostart $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-@@ -5813,13 +5813,13 @@
- *)
- tmp_sharedflag='-shared' ;;
- esac
-- _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'
+- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"'
$libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"'
$compiler_flags $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 '"$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
-@@ -5831,8 +5831,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-version-script
${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $compiler_flags $libobjs
$deplibs ${wl}-soname $wl$soname ${wl}-version-script
${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+@@ -4408,8 +4408,8 @@
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
fi
;;
-@@ -5850,8 +5850,8 @@
+@@ -4427,8 +4427,8 @@
- EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null;
then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ _LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ _LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5893,8 +5893,8 @@
+@@ -4474,8 +4474,8 @@
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC $compiler_flags -shared $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC $compiler_flags -shared
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null;
then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs
$deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags
$libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file
$wl$export_symbols -o $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -4654,7 +4654,7 @@
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags
`$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs
`$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+@@ -4698,7 +4698,7 @@
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs
$compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags
$libobjs $deplibs'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -4838,8 +4838,8 @@
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs
$deplibs $compiler_flags'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib
$libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags
-o $lib $libobjs $deplibs'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$compiler_flags -o $lib $libobjs $deplibs
${wl}-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+@@ -4902,7 +4902,7 @@
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h
${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags ${wl}-z
${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs'
+ _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 ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h
${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+@@ -5400,8 +5400,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
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -5427,7 +5427,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.
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+@@ -5598,7 +5598,7 @@
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ 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'
+ # 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
+@@ -5607,7 +5607,7 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ 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'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5817,8 +5817,8 @@
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib
$lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext |
$SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED
-e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs
$postdep_objects $compiler_flags --soname $soname -o \$templib
${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e
"s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs
$deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext |
$SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED
-e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs
$deplibs $postdep_objects --soname $soname -o \$templib
${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -5844,16 +5844,16 @@
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs
$deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"'
$libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"'
$compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"'
$compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+@@ -5895,8 +5895,8 @@
+ ;;
+ cxx*)
+ # Compaq C++
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o
$lib ${wl}-retain-symbols-file $wl$export_symbols'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o
$lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5916,12 +5916,12 @@
+ # IBM XL 8.0 on PPC, with GNU ld
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $compiler_flags
$libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname
$wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC -qmkshrobj $compiler_flags $libobjs $deplibs ${wl}-soname
$wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+@@ -6000,10 +6000,10 @@
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags
${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects
${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(whole_archive_flag_spec,
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+@@ -6076,7 +6076,7 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO
"X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects
$compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &&
$ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib
${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs
$postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &&
$ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry
${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -6163,9 +6163,9 @@
+ 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
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h
$wl$soname -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${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 -nostdlib ${wl}-M $wl$lib.exp -o $lib
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -6174,9 +6174,9 @@
+ 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 $LDFLAGS
$compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${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 -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 -o $lib $compiler_flags
$predep_objects $libobjs $deplibs $postdep_objects~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
================================================================
Index: SOURCES/libtool-multilib.patch
diff -u SOURCES/libtool-multilib.patch:1.4 SOURCES/libtool-multilib.patch:1.5
--- SOURCES/libtool-multilib.patch:1.4 Fri Dec 29 03:01:43 2006
+++ SOURCES/libtool-multilib.patch Sat Mar 8 17:41:20 2008
@@ -1,34 +1,5 @@
---- libtool-1.4.3/libltdl/acinclude.m4.multilib 2002-10-23
04:26:05.000000000 +0200
-+++ libtool-1.4.3/libltdl/acinclude.m4 2003-01-04 22:26:09.000000000 +0100
-@@ -2190,6 +2190,26 @@
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
-+
-+ # Find out which ABI we are using (multilib Linux x86_64 hack).
-+ libsuff=
-+ case "$host_cpu" in
-+ x86_64*|s390x*|powerpc64*|sparc64*)
-+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *64-bit*)
-+ libsuff=64
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff}
/usr/local/lib${libsuff}"
- ;;
-
- netbsd*)
---- libtool-1.4.3/libtool.m4.multilib 2003-01-04 22:22:16.000000000 +0100
-+++ libtool-1.4.3/libtool.m4 2003-01-04 22:25:15.000000000 +0100
+--- libtool-2.2/libltdl/m4/libtool.m4.multilib 2003-01-04 22:22:16.000000000
+0100
++++ libtool-2.2/libltdl/m4/libtool.m4 2003-01-04 22:25:15.000000000 +0100
@@ -2190,6 +2190,26 @@
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
================================================================
Index: SOURCES/libtool-relink.patch
diff -u SOURCES/libtool-relink.patch:1.7 SOURCES/libtool-relink.patch:1.8
--- SOURCES/libtool-relink.patch:1.7 Tue Apr 6 23:55:50 2004
+++ SOURCES/libtool-relink.patch Sat Mar 8 17:41:20 2008
@@ -1,5 +1,5 @@
---- libtool-1.4e/ltmain.sh.wiget Tue Jan 28 12:40:13 2003
-+++ libtool-1.4e/ltmain.sh Tue Jan 28 14:39:27 2003
+--- libtool-2.2/libltdl/config/ltmain.sh.wiget Tue Jan 28 12:40:13 2003
++++ libtool-2.2/libltdl/config/ltmain.sh Tue Jan 28 14:39:27 2003
@@ -2356,6 +2366,7 @@
if test "$linkmode" = prog || test "$mode" = relink; then
@@ -31,8 +31,8 @@
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
fi
---- libtool-1.4e/ltmain.in.wiget Tue Jan 28 14:11:13 2003
-+++ libtool-1.4e/ltmain.in Tue Jan 28 14:47:59 2003
+--- libtool-2.2/libltdl/config/ltmain.m4sh.wiget Tue Jan 28 14:11:13 2003
++++ libtool-2.2/libltdl/config/ltmain.m4sh Tue Jan 28 14:47:59 2003
@@ -2279,6 +2289,7 @@
if test "$linkmode" = prog || test "$mode" = relink; then
================================================================
Index: SOURCES/libtool.m4_cegcc.patch
diff -u SOURCES/libtool.m4_cegcc.patch:1.3 SOURCES/libtool.m4_cegcc.patch:1.4
--- SOURCES/libtool.m4_cegcc.patch:1.3 Tue Jun 26 21:09:25 2007
+++ SOURCES/libtool.m4_cegcc.patch Sat Mar 8 17:41:20 2008
@@ -1,15 +1,6 @@
---- libtool-1.5.22/libtool.m4 2007-02-27 01:08:40.913016408 +0200
-+++ libtool-1.5.22.cegcc/libtool.m4 2007-02-27 01:08:22.212594364 +0200
-@@ -595,7 +595,7 @@ sparc*-*solaris*)
- ;;
-
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-wince*-*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -715,7 +715,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+--- libtool-2.2/libltdl/m4/libtool.m4.orig 2008-03-08 16:55:22.650763650
+0100
++++ libtool-2.2/libltdl/m4/libtool.m4 2008-03-08 17:01:23.855347526 +0100
+@@ -1501,7 +1501,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
@@ -18,7 +9,7 @@
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -922,7 +922,7 @@ else
+@@ -1727,7 +1727,7 @@
lt_cv_dlopen_self=yes
;;
@@ -26,8 +17,8 @@
+ mingw* | pw32* | cegcc*)
lt_cv_dlopen="LoadLibrary"
lt_cv_dlopen_libs=
- ;;
-@@ -1315,14 +1315,14 @@ bsdi[[45]]*)
+ ;;
+@@ -2199,14 +2199,14 @@
# libtool to hard-code these into programs
;;
@@ -44,7 +35,7 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -1342,7 +1342,7 @@ cygwin* | mingw* | pw32*)
+@@ -2229,7 +2229,7 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} |
$SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -52,9 +43,9 @@
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e
's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" |
$SED -e "s/^libraries://" -e "s,=/,/,g"`
-@@ -2335,6 +2335,13 @@ mingw* | pw32*)
- lt_cv_file_magic_cmd='$OBJDUMP -f'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:"
| $SED -e "s/^libraries://" -e "s,=/,/,g"`
+@@ -3026,6 +3026,13 @@
+ fi
;;
+cegcc*)
@@ -67,16 +58,7 @@
darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3039,7 +3046,7 @@ case $host_os in
- esac
- ;;
-
-- cygwin* | mingw* | pw32*)
-+ cygwin* | mingw* | pw32* | cegcc*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -4673,7 +4680,7 @@ case $host_os in
+@@ -3339,7 +3346,7 @@
aix*)
symcode='[[BCDT]]'
;;
@@ -84,17 +66,17 @@
+cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
- hpux*) # Its linker distinguishes data from code symbols
-@@ -4876,7 +4883,7 @@ AC_MSG_CHECKING([for $compiler option to
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ hpux*)
+@@ -3577,7 +3584,7 @@
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- 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'
-@@ -5150,7 +5157,7 @@ AC_MSG_CHECKING([for $compiler option to
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool-libdirs.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool-linking-order.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool-multilib.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool-relink.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libtool.m4_cegcc.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
