-update to 1.5.24
This commit is contained in:
Karsten Hopp
parent
2d8e40b31e
commit
dfb30ff597
@ -1 +1 @@
|
||||
libtool-1.5.22.tar.gz
|
||||
libtool-1.5.24.tar.gz
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- libtool-1.5.22/libtool.m4.multilib 2005-12-18 22:53:17.000000000 +0100
|
||||
+++ libtool-1.5.22/libtool.m4 2006-06-08 11:12:46.000000000 +0200
|
||||
@@ -1572,10 +1572,27 @@
|
||||
# before this can be enabled.
|
||||
hardcode_into_libs=yes
|
||||
|
||||
+ # find out which ABI we are using
|
||||
+ libsuff=
|
||||
+ case "$host_cpu" in
|
||||
+ x86_64*|s390x*|powerpc64*)
|
||||
+ 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
|
||||
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+ rm -rf conftest*
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
@ -1,648 +0,0 @@
|
||||
--- libtool-1.5.22/libltdl/config.guess 2005-12-18 21:25:46.000000000 +0100
|
||||
+++ /usr/share/automake-1.10/config.guess 2006-11-21 10:23:16.000000000 +0100
|
||||
@@ -1,9 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
+# Inc.
|
||||
|
||||
-timestamp='2005-12-13'
|
||||
+timestamp='2006-07-02'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@@ -106,7 +107,7 @@
|
||||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||
: ${TMPDIR=/tmp} ;
|
||||
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||
@@ -206,8 +207,11 @@
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
+ *:SolidBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
macppc:MirBSD:*:*)
|
||||
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:MirBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
@@ -764,7 +768,14 @@
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:FreeBSD:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
+ case ${UNAME_MACHINE} in
|
||||
+ pc98)
|
||||
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ amd64)
|
||||
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ *)
|
||||
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ esac
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
@@ -779,8 +790,11 @@
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
- x86:Interix*:[345]*)
|
||||
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||
+ x86:Interix*:[3456]*)
|
||||
+ echo i586-pc-interix${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ EM64T:Interix*:[3456]*)
|
||||
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
@@ -817,6 +831,9 @@
|
||||
arm*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
+ avr32*:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo cris-axis-linux-gnu
|
||||
exit ;;
|
||||
@@ -851,7 +868,11 @@
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^CPU/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
@@ -870,7 +891,11 @@
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^CPU/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
@@ -967,7 +992,7 @@
|
||||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
- #if defined(__INTEL_COMPILER) || defined(__PGI)
|
||||
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
@@ -977,7 +1002,11 @@
|
||||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^LIBC/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
--- libtool-1.5.22/libltdl/config.sub 2005-12-18 21:25:46.000000000 +0100
|
||||
+++ /usr/share/automake-1.10/config.sub 2006-11-21 10:23:16.000000000 +0100
|
||||
@@ -1,9 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
+# Inc.
|
||||
|
||||
-timestamp='2005-12-11'
|
||||
+timestamp='2006-09-20'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@@ -240,7 +241,7 @@
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
@@ -248,7 +249,8 @@
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
+ | maxq | mb | microblaze | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -268,26 +270,25 @@
|
||||
| mn10200 | mn10300 \
|
||||
| mt \
|
||||
| msp430 \
|
||||
+ | nios | nios2 \
|
||||
| ns16k | ns32k \
|
||||
| or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
+ | score \
|
||||
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||
- | sparcv8 | sparcv9 | sparcv9b \
|
||||
- | strongarm \
|
||||
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
+ | spu | strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| we32k \
|
||||
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
- m32c)
|
||||
- basic_machine=$basic_machine-unknown
|
||||
- ;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
@@ -317,7 +318,7 @@
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
- | avr-* \
|
||||
+ | avr-* | avr32-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
@@ -328,7 +329,7 @@
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
- | m32r-* | m32rle-* \
|
||||
+ | m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
@@ -350,29 +351,28 @@
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
+ | nios-* | nios2-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
- m32c-*)
|
||||
- ;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
@@ -818,6 +818,12 @@
|
||||
pc532 | pc532-*)
|
||||
basic_machine=ns32k-pc532
|
||||
;;
|
||||
+ pc98)
|
||||
+ basic_machine=i386-pc
|
||||
+ ;;
|
||||
+ pc98-*)
|
||||
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ ;;
|
||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||
basic_machine=i586-pc
|
||||
;;
|
||||
@@ -904,6 +910,10 @@
|
||||
sb1el)
|
||||
basic_machine=mipsisa64sb1el-unknown
|
||||
;;
|
||||
+ sde)
|
||||
+ basic_machine=mipsisa32-sde
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
sei)
|
||||
basic_machine=mips-sei
|
||||
os=-seiux
|
||||
@@ -1120,7 +1130,7 @@
|
||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
- sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
@@ -1193,7 +1203,8 @@
|
||||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
+ | -openbsd* | -solidbsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
@@ -1208,7 +1219,7 @@
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
- | -skyos* | -haiku* | -rdos*)
|
||||
+ | -skyos* | -haiku* | -rdos* | -toppers*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1360,6 +1371,12 @@
|
||||
# system, and we'll never get to this point.
|
||||
|
||||
case $basic_machine in
|
||||
+ score-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
+ spu-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
@@ -1369,9 +1386,9 @@
|
||||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
- c4x-* | tic4x-*)
|
||||
- os=-coff
|
||||
- ;;
|
||||
+ c4x-* | tic4x-*)
|
||||
+ os=-coff
|
||||
+ ;;
|
||||
# This must come before the *-dec entry.
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
--- libtool-1.5.22/config.guess 2005-12-18 22:53:17.000000000 +0100
|
||||
+++ /usr/share/automake-1.10/config.guess 2006-11-21 10:23:16.000000000 +0100
|
||||
@@ -1,9 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
+# Inc.
|
||||
|
||||
-timestamp='2005-12-13'
|
||||
+timestamp='2006-07-02'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@@ -106,7 +107,7 @@
|
||||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||
: ${TMPDIR=/tmp} ;
|
||||
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||
@@ -206,8 +207,11 @@
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
+ *:SolidBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
macppc:MirBSD:*:*)
|
||||
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:MirBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
@@ -764,7 +768,14 @@
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:FreeBSD:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
+ case ${UNAME_MACHINE} in
|
||||
+ pc98)
|
||||
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ amd64)
|
||||
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ *)
|
||||
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
+ esac
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
@@ -779,8 +790,11 @@
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
- x86:Interix*:[345]*)
|
||||
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||
+ x86:Interix*:[3456]*)
|
||||
+ echo i586-pc-interix${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ EM64T:Interix*:[3456]*)
|
||||
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
@@ -817,6 +831,9 @@
|
||||
arm*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
+ avr32*:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo cris-axis-linux-gnu
|
||||
exit ;;
|
||||
@@ -851,7 +868,11 @@
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^CPU/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
@@ -870,7 +891,11 @@
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^CPU/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
@@ -967,7 +992,7 @@
|
||||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
- #if defined(__INTEL_COMPILER) || defined(__PGI)
|
||||
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
@@ -977,7 +1002,11 @@
|
||||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
|
||||
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
+ /^LIBC/{
|
||||
+ s: ::g
|
||||
+ p
|
||||
+ }'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
--- libtool-1.5.22/config.sub 2005-12-18 22:53:17.000000000 +0100
|
||||
+++ /usr/share/automake-1.10/config.sub 2006-11-21 10:23:16.000000000 +0100
|
||||
@@ -1,9 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
+# Inc.
|
||||
|
||||
-timestamp='2005-12-11'
|
||||
+timestamp='2006-09-20'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@@ -240,7 +241,7 @@
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
@@ -248,7 +249,8 @@
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
+ | maxq | mb | microblaze | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -268,26 +270,25 @@
|
||||
| mn10200 | mn10300 \
|
||||
| mt \
|
||||
| msp430 \
|
||||
+ | nios | nios2 \
|
||||
| ns16k | ns32k \
|
||||
| or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
+ | score \
|
||||
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||
- | sparcv8 | sparcv9 | sparcv9b \
|
||||
- | strongarm \
|
||||
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
+ | spu | strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| we32k \
|
||||
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
- m32c)
|
||||
- basic_machine=$basic_machine-unknown
|
||||
- ;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
@@ -317,7 +318,7 @@
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
- | avr-* \
|
||||
+ | avr-* | avr32-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
@@ -328,7 +329,7 @@
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
- | m32r-* | m32rle-* \
|
||||
+ | m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
@@ -350,29 +351,28 @@
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
+ | nios-* | nios2-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
- m32c-*)
|
||||
- ;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
@@ -818,6 +818,12 @@
|
||||
pc532 | pc532-*)
|
||||
basic_machine=ns32k-pc532
|
||||
;;
|
||||
+ pc98)
|
||||
+ basic_machine=i386-pc
|
||||
+ ;;
|
||||
+ pc98-*)
|
||||
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ ;;
|
||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||
basic_machine=i586-pc
|
||||
;;
|
||||
@@ -904,6 +910,10 @@
|
||||
sb1el)
|
||||
basic_machine=mipsisa64sb1el-unknown
|
||||
;;
|
||||
+ sde)
|
||||
+ basic_machine=mipsisa32-sde
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
sei)
|
||||
basic_machine=mips-sei
|
||||
os=-seiux
|
||||
@@ -1120,7 +1130,7 @@
|
||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
- sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
@@ -1193,7 +1203,8 @@
|
||||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
+ | -openbsd* | -solidbsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
@@ -1208,7 +1219,7 @@
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
- | -skyos* | -haiku* | -rdos*)
|
||||
+ | -skyos* | -haiku* | -rdos* | -toppers*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1360,6 +1371,12 @@
|
||||
# system, and we'll never get to this point.
|
||||
|
||||
case $basic_machine in
|
||||
+ score-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
+ spu-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
@@ -1369,9 +1386,9 @@
|
||||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
- c4x-* | tic4x-*)
|
||||
- os=-coff
|
||||
- ;;
|
||||
+ c4x-* | tic4x-*)
|
||||
+ os=-coff
|
||||
+ ;;
|
||||
# This must come before the *-dec entry.
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
@ -1,109 +0,0 @@
|
||||
--- libtool-1.5.22/libtool.m4.rh1 2006-11-06 14:41:03.000000000 +0100
|
||||
+++ libtool-1.5.22/libtool.m4 2006-11-06 14:41:03.000000000 +0100
|
||||
@@ -1591,7 +1591,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
||||
fi
|
||||
|
||||
--- libtool-1.5.22/libltdl/configure.rh1 2005-12-18 23:13:59.000000000 +0100
|
||||
+++ libtool-1.5.22/libltdl/configure 2006-11-06 14:41:03.000000000 +0100
|
||||
@@ -9516,7 +9516,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -13475,7 +13475,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -16066,7 +16066,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -18668,7 +18668,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
--- libtool-1.5.22/libltdl/acinclude.m4.rh1 2005-12-18 23:13:49.000000000 +0100
|
||||
+++ libtool-1.5.22/libltdl/acinclude.m4 2006-11-06 14:43:30.000000000 +0100
|
||||
@@ -1574,7 +1574,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
--- libtool-1.5.22/configure.rh1 2005-12-18 23:13:49.000000000 +0100
|
||||
+++ libtool-1.5.22/configure 2006-11-06 14:41:03.000000000 +0100
|
||||
@@ -9643,7 +9643,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -13602,7 +13602,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -16193,7 +16193,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@@ -18795,7 +18795,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
--- libtool-1.5.22/acinclude.m4.rh1 2005-12-18 23:13:42.000000000 +0100
|
||||
+++ libtool-1.5.22/acinclude.m4 2006-11-06 14:44:18.000000000 +0100
|
||||
@@ -1574,7 +1574,7 @@
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@ -1,403 +0,0 @@
|
||||
--- libtool-1.5.22/ltmain.in.rh1 2006-06-08 12:37:19.000000000 +0200
|
||||
+++ libtool-1.5.22/ltmain.in 2006-06-08 13:15:59.000000000 +0200
|
||||
@@ -46,10 +46,16 @@
|
||||
VERSION=@VERSION@
|
||||
TIMESTAMP="@TIMESTAMP@"
|
||||
|
||||
-# See if we are running on zsh, and set the options which allow our
|
||||
-# commands through without removal of \ escapes.
|
||||
-if test -n "${ZSH_VERSION+set}" ; then
|
||||
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
+ emulate sh
|
||||
+ NULLCMD=:
|
||||
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||||
+ # is contrary to our usage. Disable this feature.
|
||||
+ alias -g '${1+"$@"}'='"$@"'
|
||||
setopt NO_GLOB_SUBST
|
||||
+else
|
||||
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
|
||||
# Check that we have a working $echo.
|
||||
@@ -105,12 +111,14 @@
|
||||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
# We save the old values to restore during execute mode.
|
||||
-if test "${LC_ALL+set}" = set; then
|
||||
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
||||
-fi
|
||||
-if test "${LANG+set}" = set; then
|
||||
- save_LANG="$LANG"; LANG=C; export LANG
|
||||
-fi
|
||||
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
+do
|
||||
+ eval "if test \"\${$lt_var+set}\" = set; then
|
||||
+ save_$lt_var=\$$lt_var
|
||||
+ $lt_var=C
|
||||
+ export $lt_var
|
||||
+ fi"
|
||||
+done
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
lt_nl='
|
||||
@@ -136,6 +144,8 @@
|
||||
preserve_args=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
+extracted_archives=
|
||||
+extracted_serial=0
|
||||
|
||||
#####################################
|
||||
# Shell function definitions:
|
||||
@@ -327,7 +337,17 @@
|
||||
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||
esac
|
||||
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
||||
- my_xdir="$my_gentop/$my_xlib"
|
||||
+ my_xlib_u=$my_xlib
|
||||
+ while :; do
|
||||
+ case " $extracted_archives " in
|
||||
+ *" $my_xlib_u "*)
|
||||
+ extracted_serial=`expr $extracted_serial + 1`
|
||||
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||
+ *) break ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ extracted_archives="$extracted_archives $my_xlib_u"
|
||||
+ my_xdir="$my_gentop/$my_xlib_u"
|
||||
|
||||
$show "${rm}r $my_xdir"
|
||||
$run ${rm}r "$my_xdir"
|
||||
@@ -758,6 +778,7 @@
|
||||
*.f90) xform=f90 ;;
|
||||
*.for) xform=for ;;
|
||||
*.java) xform=java ;;
|
||||
+ *.obj) xform=obj ;;
|
||||
esac
|
||||
|
||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||
@@ -1138,8 +1159,9 @@
|
||||
for arg
|
||||
do
|
||||
case $arg in
|
||||
- -all-static | -static)
|
||||
- if test "X$arg" = "X-all-static"; then
|
||||
+ -all-static | -static | -static-libtool-libs)
|
||||
+ case $arg in
|
||||
+ -all-static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
||||
fi
|
||||
@@ -1147,12 +1169,20 @@
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
- else
|
||||
+ ;;
|
||||
+ -static)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=built
|
||||
- fi
|
||||
+ ;;
|
||||
+ -static-libtool-libs)
|
||||
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
+ dlopen_self=$dlopen_self_static
|
||||
+ fi
|
||||
+ prefer_static_libs=yes
|
||||
+ ;;
|
||||
+ esac
|
||||
build_libtool_libs=no
|
||||
build_old_libs=yes
|
||||
break
|
||||
@@ -1712,7 +1742,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -static)
|
||||
+ -static | -static-libtool-libs)
|
||||
# The effects of -static are defined in a previous loop.
|
||||
# We used to do the same as -all-static on platforms that
|
||||
# didn't have a PIC flag, but the assumption that the effects
|
||||
@@ -2490,7 +2520,9 @@
|
||||
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
if test -n "$library_names" &&
|
||||
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
+ { { test "$prefer_static_libs" = no ||
|
||||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||
+ test -z "$old_library"; }; then
|
||||
# We need to hardcode the library path
|
||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
@@ -3186,7 +3218,7 @@
|
||||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
- darwin|linux|osf|windows)
|
||||
+ darwin|linux|osf|windows|none)
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_revision"
|
||||
@@ -3410,11 +3442,11 @@
|
||||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
- for path in $notinst_path; do
|
||||
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
- done
|
||||
+# for path in $notinst_path; do
|
||||
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
+# done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
# If the user specified any rpath flags, then add them.
|
||||
@@ -3515,13 +3547,12 @@
|
||||
int main() { return 0; }
|
||||
EOF
|
||||
$rm conftest
|
||||
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
||||
- if test "$?" -eq 0 ; then
|
||||
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name=`expr $i : '-l\(.*\)'`
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
- if test "$name" != "" && test "$name" -ne "0"; then
|
||||
+ if test "$name" != "" && test "$name" != "0"; then
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
*" $i "*)
|
||||
@@ -3560,9 +3591,7 @@
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
$rm conftest
|
||||
- $LTCC $LTCFLAGS -o conftest conftest.c $i
|
||||
- # Did it work?
|
||||
- if test "$?" -eq 0 ; then
|
||||
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||
ldd_output=`ldd conftest`
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
@@ -3594,7 +3623,7 @@
|
||||
droppeddeps=yes
|
||||
$echo
|
||||
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
||||
- $echo "*** make it link in! You will probably need to install it or some"
|
||||
+ $echo "*** make it link in! You will probably need to install it or some"
|
||||
$echo "*** library that it depends on before this library will be fully"
|
||||
$echo "*** functional. Installing it before continuing would be even better."
|
||||
fi
|
||||
@@ -4239,12 +4268,14 @@
|
||||
reload_conv_objs=
|
||||
gentop=
|
||||
# reload_cmds runs $LD directly, so let us get rid of
|
||||
- # -Wl from whole_archive_flag_spec
|
||||
+ # -Wl from whole_archive_flag_spec and hope we can get by with
|
||||
+ # turning comma into space..
|
||||
wl=
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||
else
|
||||
gentop="$output_objdir/${obj}x"
|
||||
generated="$generated $gentop"
|
||||
@@ -4692,16 +4723,16 @@
|
||||
case $host in
|
||||
*cygwin* | *mingw* )
|
||||
if test -f "$output_objdir/${outputname}.def" ; then
|
||||
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
else
|
||||
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -4716,13 +4747,13 @@
|
||||
# really was required.
|
||||
|
||||
# Nullify the symbol file.
|
||||
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||
# Replace the output file specification.
|
||||
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
||||
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
|
||||
link_command="$compile_command$compile_rpath"
|
||||
|
||||
# We have no uninstalled library dependencies, so finalize right now.
|
||||
@@ -4809,7 +4840,7 @@
|
||||
if test "$fast_install" != no; then
|
||||
link_command="$finalize_var$compile_command$finalize_rpath"
|
||||
if test "$fast_install" = yes; then
|
||||
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
|
||||
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
|
||||
else
|
||||
# fast_install is set to needless
|
||||
relink_command=
|
||||
@@ -4846,7 +4877,7 @@
|
||||
fi
|
||||
done
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
fi
|
||||
|
||||
# Quote $echo for shipping.
|
||||
@@ -5253,6 +5284,18 @@
|
||||
Xsed='${SED} -e 1s/^X//'
|
||||
sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||
+ emulate sh
|
||||
+ NULLCMD=:
|
||||
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
|
||||
+ # is contrary to our usage. Disable this feature.
|
||||
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||||
+ setopt NO_GLOB_SUBST
|
||||
+else
|
||||
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||
+fi
|
||||
+
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
@@ -5395,7 +5438,7 @@
|
||||
;;
|
||||
esac
|
||||
$echo >> $output "\
|
||||
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
||||
+ \$echo \"\$0: cannot exec \$program \$*\"
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
else
|
||||
@@ -5581,7 +5624,7 @@
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
@@ -5926,9 +5969,9 @@
|
||||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
||||
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
|
||||
else
|
||||
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
||||
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||
@@ -6137,7 +6180,7 @@
|
||||
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
||||
outputname="$tmpdir/$file"
|
||||
# Replace the output file specification.
|
||||
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
||||
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
|
||||
|
||||
$show "$relink_command"
|
||||
if $run eval "$relink_command"; then :
|
||||
@@ -6413,12 +6456,13 @@
|
||||
fi
|
||||
|
||||
# Restore saved environment variables
|
||||
- if test "${save_LC_ALL+set}" = set; then
|
||||
- LC_ALL="$save_LC_ALL"; export LC_ALL
|
||||
- fi
|
||||
- if test "${save_LANG+set}" = set; then
|
||||
- LANG="$save_LANG"; export LANG
|
||||
- fi
|
||||
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
+ do
|
||||
+ eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||
+ $lt_var=\$save_$lt_var; export $lt_var
|
||||
+ fi"
|
||||
+ done
|
||||
+
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd="\$cmd$args"
|
||||
@@ -6775,9 +6821,9 @@
|
||||
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||
-export-symbols SYMFILE
|
||||
- try to export only the symbols listed in SYMFILE
|
||||
+ try to export only the symbols listed in SYMFILE
|
||||
-export-symbols-regex REGEX
|
||||
- try to export only the symbols matching REGEX
|
||||
+ try to export only the symbols matching REGEX
|
||||
-LLIBDIR search LIBDIR for required installed libraries
|
||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||
-module build a library that can dlopened
|
||||
@@ -6791,9 +6837,11 @@
|
||||
-release RELEASE specify package release information
|
||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||
- -static do not do any dynamic linking of libtool libraries
|
||||
+ -static do not do any dynamic linking of uninstalled libtool libraries
|
||||
+ -static-libtool-libs
|
||||
+ do not do any dynamic linking of libtool libraries
|
||||
-version-info CURRENT[:REVISION[:AGE]]
|
||||
- specify library version info [each variable defaults to 0]
|
||||
+ specify library version info [each variable defaults to 0]
|
||||
|
||||
All other options (arguments beginning with \`-') are ignored.
|
||||
|
||||
--- libtool-1.5.22/libtool.m4.rh1 2006-06-08 12:32:23.000000000 +0200
|
||||
+++ libtool-1.5.22/libtool.m4 2006-06-08 12:36:53.000000000 +0200
|
||||
@@ -6378,6 +6378,7 @@
|
||||
done
|
||||
done
|
||||
done
|
||||
+IFS=$as_save_IFS
|
||||
lt_ac_max=0
|
||||
lt_ac_count=0
|
||||
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
|
||||
@@ -6410,5 +6411,6 @@
|
||||
done
|
||||
])
|
||||
SED=$lt_cv_path_SED
|
||||
+AC_SUBST([SED])
|
||||
AC_MSG_RESULT([$SED])
|
||||
])
|
||||
--- libtool-1.5.22/libltdl/ltdl.c.syntax1 2006-06-08 12:02:39.000000000 +0200
|
||||
+++ libtool-1.5.22/libltdl/ltdl.c 2006-06-08 12:03:09.000000000 +0200
|
||||
@@ -894,7 +894,7 @@
|
||||
(*lt_dlmutex_seterror_func) (errormsg); \
|
||||
else lt_dllast_error = (errormsg); } LT_STMT_END
|
||||
#define LT_DLMUTEX_GETERROR(errormsg) LT_STMT_START { \
|
||||
- if (lt_dlmutex_seterror_func) \
|
||||
+ if (lt_dlmutex_geterror_func) \
|
||||
(errormsg) = (*lt_dlmutex_geterror_func) (); \
|
||||
else (errormsg) = lt_dllast_error; } LT_STMT_END
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- libtool-1.5.22/libltdl/ltdl.c.relativepath 2007-02-08 09:20:54.000000000 -0500
|
||||
+++ libtool-1.5.22/libltdl/ltdl.c 2007-02-08 09:46:41.000000000 -0500
|
||||
@@ -3203,9 +3203,10 @@
|
||||
}
|
||||
#endif
|
||||
}
|
||||
- if (!file)
|
||||
+ if (!file)
|
||||
{
|
||||
- file = fopen (filename, LT_READTEXT_MODE);
|
||||
+ if(strstr(filename,"/") || strcmp((filename + strlen(filename) - 3), ".la") != 0)
|
||||
+ file = fopen (filename, LT_READTEXT_MODE);
|
||||
}
|
||||
|
||||
/* If we didn't find the file by now, it really isn't there. Set
|
||||
14
libtool-1.5.24-relativepath.patch
Normal file
14
libtool-1.5.24-relativepath.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -up libtool-1.5.24/libltdl/ltdl.c.relativepath libtool-1.5.24/libltdl/ltdl.c
|
||||
--- libtool-1.5.24/libltdl/ltdl.c.relativepath 2007-06-01 07:04:54.000000000 +0200
|
||||
+++ libtool-1.5.24/libltdl/ltdl.c 2007-07-24 12:56:22.000000000 +0200
|
||||
@@ -3225,7 +3225,9 @@ try_dlopen (phandle, filename)
|
||||
}
|
||||
if (!file)
|
||||
{
|
||||
- file = fopen (filename, LT_READTEXT_MODE);
|
||||
+ /* don't open .la files in current directory, root might get tricked to run a binary in a prepared directory */
|
||||
+ if(!strncmp((filename + strlen(filename) - 3), LTDL_ARCHIVE_EXT,3) || strstr(filename,"/"))
|
||||
+ file = fopen (filename, LT_READTEXT_MODE);
|
||||
}
|
||||
|
||||
/* If we didn't find the file by now, it really isn't there. Set
|
||||
31
libtool.spec
31
libtool.spec
@ -1,31 +1,21 @@
|
||||
%define upstream_version 1.5.22
|
||||
%define upstream_version 1.5.24
|
||||
|
||||
Summary: The GNU Portable Library Tool
|
||||
Name: libtool
|
||||
Version: %{upstream_version}
|
||||
Release: 11%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: GPL
|
||||
Group: Development/Tools
|
||||
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
|
||||
URL: http://www.gnu.org/software/libtool/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
Patch1: libtool-1.5.18-multilib.patch
|
||||
|
||||
# Remove in libtool-1.5.23:
|
||||
Patch2: libtool-1.5.22-misc.patch
|
||||
|
||||
#Patch3: libtool-1.5.22-anygcc1.patch
|
||||
|
||||
# skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths (p.e. files from kernel-xen):
|
||||
Patch4: libtool-1.5.22-ldconfigvars.patch
|
||||
|
||||
Patch5: libtool-1.5.22-configupdate-217166.patch
|
||||
Patch1: libtool-1.5.24-multilib.patch
|
||||
|
||||
# don't read .la file in current working directory, root might get tricked
|
||||
# into running a prepared binary in that directory:
|
||||
Patch6: libtool-1.5.22-relativepath.patch
|
||||
Patch2: libtool-1.5.24-relativepath.patch
|
||||
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
|
||||
# make sure we can configure all supported langs
|
||||
BuildRequires: gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java
|
||||
@ -87,12 +77,8 @@ Static libraries and header files for development with ltdl.
|
||||
|
||||
%prep
|
||||
%setup -n libtool-%{upstream_version} -q
|
||||
%patch1 -p1 -b .multilib
|
||||
%patch2 -p1 -b .misc
|
||||
#patch3 -p1 -b .anygcc
|
||||
%patch4 -p1 -b .ldconfigvars
|
||||
%patch5 -p1 -b .automake110
|
||||
%patch6 -p1 -b .relativepath
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
|
||||
@ -164,6 +150,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 24 2007 Karsten Hopp <karsten@redhat.com> 1.5.24-1
|
||||
- update to libtool 1.5.24
|
||||
|
||||
* Thu Apr 05 2007 Karsten Hopp <karsten@redhat.com> 1.5.22-11
|
||||
- use ./configure so that config.{sub,guess} will not be replaced with ancient
|
||||
version of those files (#234778)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user