Hi Ralf,
* Ralf Menzel wrote on Mon, Mar 21, 2005 at 08:16:50PM CET:
> Ralf Wildenhues <[EMAIL PROTECTED]> writes:
> >> Does the patch against branch-1-5 below help with the mdemo failures?
> >
> > Forget that patch, it was bogus, sorry. $wlarc needs to be expanded at
> > configure time. Try this one instead.
>
> Looks good. I applied the patch to a recent checkout of branch-1-5.
> It reduces the number of failed tests to three:
*snip*
> So all the mdemo tests passed.
Very good.
I just realized I introduced that regression into branch-1-5. :(
> I will have a look at the other things tomorrow.
Thanks.
FYI: I am checking in the patches attached, also adding thanks to pooh
and turning the `ChangeLog' files into UTF-8 mode.
Regards,
Ralf
2005-05-22 Ralf Wildenhues <[EMAIL PROTECTED]>
* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [solaris]: Use ${wlarc}
and set to empty when using $LD for linking. Fixes regression
introduced in 2004-12-20.
Reported by Ralf Menzel <[EMAIL PROTECTED]> and
ÐÑÑÐÐÑÑÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÐÑ <[EMAIL PROTECTED]>.
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.70
diff -u -r1.314.2.70 libtool.m4
--- libtool.m4 14 Mar 2005 11:12:05 -0000 1.314.2.70
+++ libtool.m4 18 Mar 2005 14:25:54 -0000
@@ -5757,10 +5761,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
+ wlarc='${wl}'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o
$lib $libobjs $deplibs $compiler_flags'
_LT_AC_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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib
$libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
+ wlarc=''
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" >
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo
"local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $linker_flags~$rm $lib.exp'
@@ -5770,7 +5776,7 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z
${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="${wlarc}-z
${wlarc}allextract\$convenience ${wlarc}-z ${wlarc}defaultextract" ;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
2005-05-22 Ralf Wildenhues <[EMAIL PROTECTED]>
* m4/libtool.m4 (_LT_LINKER_SHLIBS) [solaris]: Use ${wlarc}
and set to empty when using $LD for linking. Fixes regression
introduced in 2004-11-17.
Reported by Ralf Menzel <[EMAIL PROTECTED]> and
ÐÑÑÐÐÑÑÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÐÑ <[EMAIL PROTECTED]>.
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.174
diff -u -r1.174 libtool.m4
--- m4/libtool.m4 21 Mar 2005 17:59:39 -0000 1.174
+++ m4/libtool.m4 22 Mar 2005 07:26:58 -0000
@@ -4221,17 +4221,20 @@
solaris*)
_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_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
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
+ wlarc=''
_LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "{ global:" > $lib.exp~cat
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$ECHO "local: *; };" >>
$lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $linker_flags~$RM $lib.exp'
;;
*)
+ wlarc='${wl}'
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h
$soname -o $lib $libobjs $deplibs $compiler_flags'
_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${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs
$deplibs $compiler_flags~$RM $lib.exp'
@@ -4243,7 +4246,7 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z
${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
+ _LT_TAGVAR(whole_archive_flag_spec, $1)="${wlarc}-z
${wlarc}allextract\$convenience ${wlarc}-z ${wlarc}defaultextract" ;;
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
