[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [patch #1863] Fix to ltmain.sh for older automakes
From: |
Mark Wielaard |
Subject: |
Re: [patch #1863] Fix to ltmain.sh for older automakes |
Date: |
Tue, 26 Aug 2003 21:56:40 +0200 |
Hi,
On Tue, 2003-08-26 at 17:29, address@hidden wrote:
> Patch #1863 has been updated.
>
> This patch allows me to (continue to) use the CVS'ed
> ltmain.sh in conjunction with the following versions of
> the auto* toolchain:
>
> automake/aclocal 1.6.1
> autoconf/autoheader 2.53
>
> (The breakage happened a couple of days ago.)
>
> If the patch is correct, it probably needs to be applied
> to libtool as well.
>
> For more info, visit:
>
> http://savannah.gnu.org/patch/?func=detailpatch&patch_id=1863&group_id=85
Thanks. Is this a known issue with the libtoolize generated ltmain.sh
and older automake?
I have added Dalibor to the CC since he said something similar about
older automake and sed handling on irc and he might recognize this
(patch attached).
Cheers,
Mark
P.S. I use Automake 1.7.6 and Autoconf 2.57
? external/Makefile
? external/Makefile.in
? include/Makefile
? include/Makefile.in
? lib/org
? lib/resources
Index: ltmain.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/ltmain.sh,v
retrieving revision 1.5
diff -p -r1.5 ltmain.sh
*** ltmain.sh 24 Aug 2003 18:10:56 -0000 1.5
--- ltmain.sh 26 Aug 2003 15:22:31 -0000
***************
*** 24,29 ****
--- 24,37 ----
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+ # Backwards compatibility hacks for older versions of automake, etc
+ if test "X$SED" = X ; then
+ SED=sed
+ fi
+ if test "X$max_cmd_len" = X ; then
+ max_cmd_len=-1
+ fi
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
*************** fi\
*** 4969,4976 ****
else
eval cmds=\"$old_archive_cmds\"
! if len=`expr "X$cmds" : ".*"` &&
! test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
# the command line is too long to link in one step, link in parts
--- 4977,4984 ----
else
eval cmds=\"$old_archive_cmds\"
! len=`expr "X$cmds" : ".*"`
! if test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
# the command line is too long to link in one step, link in parts
*************** fi\
*** 4984,4990 ****
# encoded into archives. This makes 'ar r' malfunction in
# this piecewise linking case whenever conflicting object
# names appear in distinct ar calls; check, warn and compensate.
! if (for obj in $save_oldobjs
do
$echo "X$obj" | $Xsed -e 's%^.*/%%'
done | sort | sort -uc >/dev/null 2>&1); then
--- 4992,4998 ----
# encoded into archives. This makes 'ar r' malfunction in
# this piecewise linking case whenever conflicting object
# names appear in distinct ar calls; check, warn and compensate.
! if (for obj in $save_oldobjs
do
$echo "X$obj" | $Xsed -e 's%^.*/%%'
done | sort | sort -uc >/dev/null 2>&1); then