autoconf/automake: Switch to 2.65 and 1.11.1
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
fa9f3991d5
commit
29d1df5b97
|
@ -1,36 +0,0 @@
|
|||
Index: lib/autoconf/libs.m4
|
||||
===================================================================
|
||||
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
|
||||
retrieving revision 1.13
|
||||
diff -p -u -r1.13 libs.m4
|
||||
--- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13
|
||||
+++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000
|
||||
@@ -265,13 +265,13 @@ ac_x_header_dirs='
|
||||
/usr/openwin/share/include'
|
||||
|
||||
if test "$ac_x_includes" = no; then
|
||||
- # Guess where to find include files, by looking for Intrinsic.h.
|
||||
+ # Guess where to find include files, by looking for Xlib.h.
|
||||
# First, try using that file with no special directory specified.
|
||||
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
|
||||
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
|
||||
[# We can compile using X headers with no special include directory.
|
||||
ac_x_includes=],
|
||||
[for ac_dir in $ac_x_header_dirs; do
|
||||
- if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
+ if test -r "$ac_dir/X11/Xlib.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
- LIBS="-lXt $LIBS"
|
||||
- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
|
||||
- [XtMalloc (0)])],
|
||||
+ LIBS="-lX11 $LIBS"
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
|
||||
+ [XrmInitialize ()])],
|
||||
[LIBS=$ac_save_LIBS
|
||||
# We can link X programs with no special library path.
|
||||
ac_x_libraries=],
|
|
@ -1,393 +0,0 @@
|
|||
--- autoconf-2.59/build-aux/config.guess.old 2003-10-23 10:28:51.000000000 -0400
|
||||
+++ autoconf-2.59/build-aux/config.guess 2004-04-24 22:36:28.000000000 -0400
|
||||
@@ -3,7 +3,7 @@
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
-timestamp='2003-10-03'
|
||||
+timestamp='2004-03-12'
|
||||
|
||||
# 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
|
||||
@@ -197,12 +197,18 @@
|
||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
||||
echo "${machine}-${os}${release}"
|
||||
exit 0 ;;
|
||||
+ amd64:OpenBSD:*:*)
|
||||
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
amiga:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
arc:OpenBSD:*:*)
|
||||
echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ cats:OpenBSD:*:*)
|
||||
+ echo arm-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
hp300:OpenBSD:*:*)
|
||||
echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
@@ -221,6 +227,9 @@
|
||||
mvmeppc:OpenBSD:*:*)
|
||||
echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ pegasos:OpenBSD:*:*)
|
||||
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
pmax:OpenBSD:*:*)
|
||||
echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
@@ -236,10 +245,24 @@
|
||||
*:OpenBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ *:ekkoBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ macppc:MirBSD:*:*)
|
||||
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ *:MirBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
alpha:OSF1:*:*)
|
||||
- if test $UNAME_RELEASE = "V4.0"; then
|
||||
+ case $UNAME_RELEASE in
|
||||
+ *4.0)
|
||||
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
||||
- fi
|
||||
+ ;;
|
||||
+ *5.*)
|
||||
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
|
||||
+ ;;
|
||||
+ esac
|
||||
# According to Compaq, /usr/sbin/psrinfo has been available on
|
||||
# OSF/1 and Tru64 systems produced since 1995. I hope that
|
||||
# covers most systems running today. This code pipes the CPU
|
||||
@@ -277,11 +300,12 @@
|
||||
"EV7.9 (21364A)")
|
||||
UNAME_MACHINE="alphaev79" ;;
|
||||
esac
|
||||
+ # A Pn.n version is a patched version.
|
||||
# A Vn.n version is a released version.
|
||||
# A Tn.n version is a released field test version.
|
||||
# A Xn.n version is an unreleased experimental baselevel.
|
||||
# 1.2 uses "1.2" for uname -r.
|
||||
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
exit 0 ;;
|
||||
Alpha*:OpenVMS:*:*)
|
||||
echo alpha-hp-vms
|
||||
@@ -307,6 +331,9 @@
|
||||
*:OS/390:*:*)
|
||||
echo i370-ibm-openedition
|
||||
exit 0 ;;
|
||||
+ *:OS400:*:*)
|
||||
+ echo powerpc-ibm-os400
|
||||
+ exit 0 ;;
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit 0;;
|
||||
@@ -399,6 +426,9 @@
|
||||
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
|
||||
echo m68k-unknown-mint${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ m68k:machten:*:*)
|
||||
+ echo m68k-apple-machten${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
powerpc:machten:*:*)
|
||||
echo powerpc-apple-machten${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
@@ -742,6 +772,11 @@
|
||||
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
||||
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
||||
exit 0 ;;
|
||||
+ 5000:UNIX_System_V:4.*:*)
|
||||
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
||||
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
|
||||
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
||||
+ exit 0 ;;
|
||||
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
@@ -751,7 +786,7 @@
|
||||
*:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
|
||||
+ *:FreeBSD:*:*)
|
||||
# Determine whether the default compiler uses glibc.
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
@@ -763,7 +798,7 @@
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
- # GNU/FreeBSD systems have a "k" prefix to indicate we are using
|
||||
+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
|
||||
# FreeBSD's kernel, but not the complete OS.
|
||||
case ${LIBC} in gnu) kernel_only='k' ;; esac
|
||||
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
|
||||
@@ -799,8 +834,13 @@
|
||||
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit 0 ;;
|
||||
*:GNU:*:*)
|
||||
+ # the GNU system
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit 0 ;;
|
||||
+ *:GNU/*:*:*)
|
||||
+ # other systems with GNU libc and userland
|
||||
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
|
||||
+ exit 0 ;;
|
||||
i*86:Minix:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit 0 ;;
|
||||
@@ -813,6 +853,9 @@
|
||||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit 0 ;;
|
||||
+ m32r*:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ exit 0 ;;
|
||||
m68*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit 0 ;;
|
||||
@@ -981,6 +1024,9 @@
|
||||
i*86:atheos:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-atheos
|
||||
exit 0 ;;
|
||||
+ i*86:syllable:*:*)
|
||||
+ echo ${UNAME_MACHINE}-pc-syllable
|
||||
+ exit 0 ;;
|
||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
@@ -1052,7 +1098,7 @@
|
||||
exit 0 ;;
|
||||
M68*:*:R3V[567]*:*)
|
||||
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
|
||||
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
|
||||
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
|
||||
OS_REL=''
|
||||
test -r /etc/.relid \
|
||||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
@@ -1167,7 +1213,7 @@
|
||||
*:QNX:*:4*)
|
||||
echo i386-pc-qnx
|
||||
exit 0 ;;
|
||||
- NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
|
||||
+ NSR-?:NONSTOP_KERNEL:*:*)
|
||||
echo nsr-tandem-nsk${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:NonStop-UX:*:*)
|
||||
@@ -1211,6 +1257,9 @@
|
||||
SEI:*:*:SEIUX)
|
||||
echo mips-sei-seiux${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ *:DragonFly:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
+ exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
--- autoconf-2.59/build-aux/config.sub.old 2003-10-23 10:28:51.000000000 -0400
|
||||
+++ autoconf-2.59/build-aux/config.sub 2004-04-24 22:36:28.000000000 -0400
|
||||
@@ -3,7 +3,7 @@
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
-timestamp='2003-08-18'
|
||||
+timestamp='2004-03-12'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@@ -118,7 +118,8 @@
|
||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
- nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
|
||||
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
@@ -236,7 +237,7 @@
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
- | m32r | m68000 | m68k | m88k | mcore \
|
||||
+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -261,7 +262,7 @@
|
||||
| pyramid \
|
||||
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
|
||||
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
|
||||
| strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
@@ -307,7 +308,7 @@
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
- | m32r-* \
|
||||
+ | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
@@ -335,7 +336,7 @@
|
||||
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
|
||||
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
@@ -362,6 +363,9 @@
|
||||
basic_machine=a29k-amd
|
||||
os=-udi
|
||||
;;
|
||||
+ abacus)
|
||||
+ basic_machine=abacus-unknown
|
||||
+ ;;
|
||||
adobe68k)
|
||||
basic_machine=m68010-adobe
|
||||
os=-scout
|
||||
@@ -379,6 +383,9 @@
|
||||
amd64)
|
||||
basic_machine=x86_64-pc
|
||||
;;
|
||||
+ amd64-*)
|
||||
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ ;;
|
||||
amdahl)
|
||||
basic_machine=580-amdahl
|
||||
os=-sysv
|
||||
@@ -438,12 +445,20 @@
|
||||
basic_machine=j90-cray
|
||||
os=-unicos
|
||||
;;
|
||||
+ cr16c)
|
||||
+ basic_machine=cr16c-unknown
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
crds | unos)
|
||||
basic_machine=m68k-crds
|
||||
;;
|
||||
cris | cris-* | etrax*)
|
||||
basic_machine=cris-axis
|
||||
;;
|
||||
+ crx)
|
||||
+ basic_machine=crx-unknown
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
da30 | da30-*)
|
||||
basic_machine=m68k-da30
|
||||
;;
|
||||
@@ -743,6 +758,10 @@
|
||||
basic_machine=or32-unknown
|
||||
os=-coff
|
||||
;;
|
||||
+ os400)
|
||||
+ basic_machine=powerpc-ibm
|
||||
+ os=-os400
|
||||
+ ;;
|
||||
OSE68000 | ose68000)
|
||||
basic_machine=m68000-ericsson
|
||||
os=-ose
|
||||
@@ -963,6 +982,10 @@
|
||||
tower | tower-32)
|
||||
basic_machine=m68k-ncr
|
||||
;;
|
||||
+ tpf)
|
||||
+ basic_machine=s390x-ibm
|
||||
+ os=-tpf
|
||||
+ ;;
|
||||
udi29k)
|
||||
basic_machine=a29k-amd
|
||||
os=-udi
|
||||
@@ -1058,7 +1081,7 @@
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
- sparc | sparcv9 | sparcv9b)
|
||||
+ sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
@@ -1131,19 +1154,20 @@
|
||||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
|
||||
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
|
||||
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1182,6 +1206,9 @@
|
||||
-opened*)
|
||||
os=-openedition
|
||||
;;
|
||||
+ -os400*)
|
||||
+ os=-os400
|
||||
+ ;;
|
||||
-wince*)
|
||||
os=-wince
|
||||
;;
|
||||
@@ -1203,6 +1230,9 @@
|
||||
-atheos*)
|
||||
os=-atheos
|
||||
;;
|
||||
+ -syllable*)
|
||||
+ os=-syllable
|
||||
+ ;;
|
||||
-386bsd)
|
||||
os=-bsd
|
||||
;;
|
||||
@@ -1225,6 +1255,9 @@
|
||||
-sinix*)
|
||||
os=-sysv4
|
||||
;;
|
||||
+ -tpf*)
|
||||
+ os=-tpf
|
||||
+ ;;
|
||||
-triton*)
|
||||
os=-sysv3
|
||||
;;
|
||||
@@ -1473,9 +1506,15 @@
|
||||
-mvs* | -opened*)
|
||||
vendor=ibm
|
||||
;;
|
||||
+ -os400*)
|
||||
+ vendor=ibm
|
||||
+ ;;
|
||||
-ptx*)
|
||||
vendor=sequent
|
||||
;;
|
||||
+ -tpf*)
|
||||
+ vendor=ibm
|
||||
+ ;;
|
||||
-vxsim* | -vxworks* | -windiss*)
|
||||
vendor=wrs
|
||||
;;
|
|
@ -1,13 +0,0 @@
|
|||
--- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100
|
||||
+++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100
|
||||
@@ -272,8 +272,8 @@
|
||||
}
|
||||
|
||||
}
|
||||
- exit 1
|
||||
- if keys %symbol;
|
||||
+# exit 1
|
||||
+# if keys %symbol;
|
||||
}
|
||||
|
||||
update_file ("$tmp/config.hin", "$config_h_in");
|
|
@ -1,127 +0,0 @@
|
|||
Index: autoconf-2.61/bin/autoreconf.in
|
||||
===================================================================
|
||||
--- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:25:59.000000000 +0100
|
||||
+++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:33:11.000000000 +0100
|
||||
@@ -76,6 +76,7 @@
|
||||
-i, --install copy missing auxiliary files
|
||||
--no-recursive don't rebuild sub-packages
|
||||
-s, --symlink with -i, install symbolic links instead of copies
|
||||
+ -x, --exclude=STEPS steps we should not run
|
||||
-m, --make when applicable, re-run ./configure && make
|
||||
-W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
|
||||
|
||||
@@ -134,6 +135,13 @@
|
||||
# Recurse into subpackages
|
||||
my $recursive = 1;
|
||||
|
||||
+# Steps to exclude
|
||||
+my @exclude;
|
||||
+my @ex;
|
||||
+
|
||||
+my $uses_gettext;
|
||||
+my $configure_ac;
|
||||
+
|
||||
## ---------- ##
|
||||
## Routines. ##
|
||||
## ---------- ##
|
||||
@@ -151,6 +159,7 @@
|
||||
'B|prepend-include=s' => \@prepend_include,
|
||||
'i|install' => \$install,
|
||||
's|symlink' => \$symlink,
|
||||
+ 'x|exclude=s' => \@exclude,
|
||||
'm|make' => \$make,
|
||||
'recursive!' => \$recursive);
|
||||
|
||||
@@ -160,6 +169,8 @@
|
||||
parse_WARNINGS;
|
||||
parse_warnings '--warnings', @warning;
|
||||
|
||||
+ @exclude = map { split /,/ } @exclude;
|
||||
+
|
||||
# Even if the user specified a configure.ac, trim to get the
|
||||
# directory, and look for configure.ac again. Because (i) the code
|
||||
# is simpler, and (ii) we are still able to diagnose simultaneous
|
||||
@@ -253,6 +264,11 @@
|
||||
{
|
||||
my ($aclocal, $flags) = @_;
|
||||
|
||||
+ @ex = grep (/^aclocal$/, @exclude);
|
||||
+ if ($#ex != -1) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
# aclocal 1.8+ does all this for free. It can be recognized by its
|
||||
# --force support.
|
||||
if ($aclocal_supports_force)
|
||||
@@ -366,7 +382,10 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- xsystem "$autopoint";
|
||||
+ @ex = grep (/^autopoint$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$autopoint");
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -530,7 +549,10 @@
|
||||
{
|
||||
$libtoolize .= " --ltdl";
|
||||
}
|
||||
- xsystem ($libtoolize);
|
||||
+ @ex = grep (/^libtoolize$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$libtoolize");
|
||||
+ }
|
||||
$rerun_aclocal = 1;
|
||||
}
|
||||
else
|
||||
@@ -570,7 +592,10 @@
|
||||
# latter runs the former, and (ii) autoconf is stricter than
|
||||
# autoheader. So all in all, autoconf should give better error
|
||||
# messages.
|
||||
- xsystem ($autoconf);
|
||||
+ @ex = grep (/^autoconf$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$autoconf");
|
||||
+ }
|
||||
|
||||
|
||||
# -------------------- #
|
||||
@@ -591,7 +616,10 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- xsystem ($autoheader);
|
||||
+ @ex = grep (/^autoheader$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$autoheader");
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -608,7 +636,10 @@
|
||||
# We should always run automake, and let it decide whether it shall
|
||||
# update the file or not. In fact, the effect of `$force' is already
|
||||
# included in `$automake' via `--no-force'.
|
||||
- xsystem ($automake);
|
||||
+ @ex = grep (/^automake$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$automake");
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -632,7 +663,10 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- xsystem ("make");
|
||||
+ @ex = grep (/^make$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("make");
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400
|
||||
+++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400
|
||||
@@ -184,6 +184,8 @@
|
||||
|
||||
$aclocal_supports_force = `$aclocal --help` =~ /--force/;
|
||||
|
||||
+ $automake .= ' --foreign';
|
||||
+
|
||||
# Dispatch autoreconf's option to the tools.
|
||||
# --include;
|
||||
$autoconf .= join (' --include=', '', @include);
|
|
@ -1,49 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
Index: autoconf-2.61/bin/autoreconf.in
|
||||
===================================================================
|
||||
--- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:33:52.000000000 +0100
|
||||
+++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:34:28.000000000 +0100
|
||||
@@ -58,7 +58,7 @@
|
||||
$help = "Usage: $0 [OPTION] ... [DIRECTORY] ...
|
||||
|
||||
Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
|
||||
-(formerly `gettextize'), and `libtoolize' where appropriate)
|
||||
+(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate)
|
||||
repeatedly to remake the GNU Build System files in specified
|
||||
DIRECTORIES and their subdirectories (defaulting to `.').
|
||||
|
||||
@@ -107,12 +107,13 @@
|
||||
";
|
||||
|
||||
# Lib files.
|
||||
-my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@';
|
||||
-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
|
||||
-my $automake = $ENV{'AUTOMAKE'} || 'automake';
|
||||
-my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
|
||||
-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
|
||||
-my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
|
||||
+my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@';
|
||||
+my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
|
||||
+my $automake = $ENV{'AUTOMAKE'} || 'automake';
|
||||
+my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
|
||||
+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
|
||||
+my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint';
|
||||
+my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize';
|
||||
|
||||
# --install -- as --add-missing in other tools.
|
||||
my $install = 0;
|
||||
@@ -644,6 +645,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ @ex = grep (/^gnu-configize$/, @exclude);
|
||||
+ if ($#ex == -1) {
|
||||
+ xsystem ("$gnuconfigize");
|
||||
+ }
|
||||
|
||||
# -------------- #
|
||||
# Running make. #
|
|
@ -1,10 +0,0 @@
|
|||
--- autoconf/bin/autoreconf.in~ 2004-04-06 23:36:10.000000000 +0100
|
||||
+++ autoconf/bin/autoreconf.in 2004-04-08 20:51:57.000000000 +0100
|
||||
@@ -179,6 +179,7 @@
|
||||
$autoconf .= join (' --prepend-include=', '', @prepend_include);
|
||||
$autoheader .= join (' --include=', '', @include);
|
||||
$autoheader .= join (' --prepend-include=', '', @prepend_include);
|
||||
+ $aclocal .= join (' -I ', '', @include);
|
||||
|
||||
# --install and --symlink;
|
||||
if ($install)
|
|
@ -1,13 +0,0 @@
|
|||
Index: autoconf-2.61/lib/autoconf/general.m4
|
||||
===================================================================
|
||||
--- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100
|
||||
+++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100
|
||||
@@ -1767,7 +1767,7 @@
|
||||
m4_define([AC_SITE_LOAD],
|
||||
[# Prefer explicitly selected file to automatically selected ones.
|
||||
if test -n "$CONFIG_SITE"; then
|
||||
- set x "$CONFIG_SITE"
|
||||
+ set x $CONFIG_SITE
|
||||
elif test "x$prefix" != xNONE; then
|
||||
set x "$prefix/share/config.site" "$prefix/etc/config.site"
|
||||
else
|
|
@ -1,114 +0,0 @@
|
|||
We don't build xmkmf so any values returned from it are going to be wrong.
|
||||
Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling.
|
||||
This patch removes them to stop any confusion.
|
||||
|
||||
RP - 20071115
|
||||
|
||||
Index: autoconf-2.61/lib/autoconf/libs.m4
|
||||
===================================================================
|
||||
--- autoconf-2.61.orig/lib/autoconf/libs.m4 2006-10-15 01:12:02.000000000 +0000
|
||||
+++ autoconf-2.61/lib/autoconf/libs.m4 2007-11-15 12:09:59.000000000 +0000
|
||||
@@ -180,53 +180,6 @@
|
||||
# --------------------- #
|
||||
|
||||
|
||||
-# _AC_PATH_X_XMKMF
|
||||
-# ----------------
|
||||
-# Internal subroutine of _AC_PATH_X.
|
||||
-# Set ac_x_includes and/or ac_x_libraries.
|
||||
-m4_define([_AC_PATH_X_XMKMF],
|
||||
-[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
|
||||
-rm -f -r conftest.dir
|
||||
-if mkdir conftest.dir; then
|
||||
- cd conftest.dir
|
||||
- cat >Imakefile <<'_ACEOF'
|
||||
-incroot:
|
||||
- @echo incroot='${INCROOT}'
|
||||
-usrlibdir:
|
||||
- @echo usrlibdir='${USRLIBDIR}'
|
||||
-libdir:
|
||||
- @echo libdir='${LIBDIR}'
|
||||
-_ACEOF
|
||||
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
|
||||
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||
- for ac_var in incroot usrlibdir libdir; do
|
||||
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
|
||||
- done
|
||||
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
||||
- for ac_extension in a so sl; do
|
||||
- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
|
||||
- test -f "$ac_im_libdir/libX11.$ac_extension"; then
|
||||
- ac_im_usrlibdir=$ac_im_libdir; break
|
||||
- fi
|
||||
- done
|
||||
- # Screen out bogus values from the imake configuration. They are
|
||||
- # bogus both because they are the default anyway, and because
|
||||
- # using them would break gcc on systems where it needs fixed includes.
|
||||
- case $ac_im_incroot in
|
||||
- /usr/include) ac_x_includes= ;;
|
||||
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
||||
- esac
|
||||
- case $ac_im_usrlibdir in
|
||||
- /usr/lib | /lib) ;;
|
||||
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
|
||||
- esac
|
||||
- fi
|
||||
- cd ..
|
||||
- rm -f -r conftest.dir
|
||||
-fi
|
||||
-])# _AC_PATH_X_XMKMF
|
||||
-
|
||||
-
|
||||
# _AC_PATH_X_DIRECT
|
||||
# -----------------
|
||||
# Internal subroutine of _AC_PATH_X.
|
||||
@@ -234,40 +187,7 @@
|
||||
m4_define([_AC_PATH_X_DIRECT],
|
||||
[# Standard set of common directories for X headers.
|
||||
# Check X11 before X11Rn because it is often a symlink to the current release.
|
||||
-ac_x_header_dirs='
|
||||
-/usr/X11/include
|
||||
-/usr/X11R6/include
|
||||
-/usr/X11R5/include
|
||||
-/usr/X11R4/include
|
||||
-
|
||||
-/usr/include/X11
|
||||
-/usr/include/X11R6
|
||||
-/usr/include/X11R5
|
||||
-/usr/include/X11R4
|
||||
-
|
||||
-/usr/local/X11/include
|
||||
-/usr/local/X11R6/include
|
||||
-/usr/local/X11R5/include
|
||||
-/usr/local/X11R4/include
|
||||
-
|
||||
-/usr/local/include/X11
|
||||
-/usr/local/include/X11R6
|
||||
-/usr/local/include/X11R5
|
||||
-/usr/local/include/X11R4
|
||||
-
|
||||
-/usr/X386/include
|
||||
-/usr/x386/include
|
||||
-/usr/XFree86/include/X11
|
||||
-
|
||||
-/usr/include
|
||||
-/usr/local/include
|
||||
-/usr/unsupported/include
|
||||
-/usr/athena/include
|
||||
-/usr/local/x11r5/include
|
||||
-/usr/lpp/Xamples/include
|
||||
-
|
||||
-/usr/openwin/include
|
||||
-/usr/openwin/share/include'
|
||||
+ac_x_header_dirs=''
|
||||
|
||||
if test "$ac_x_includes" = no; then
|
||||
# Guess where to find include files, by looking for Xlib.h.
|
||||
@@ -316,7 +236,6 @@
|
||||
[AC_CACHE_VAL(ac_cv_have_x,
|
||||
[# One or both of the vars are not set, and there is no cached value.
|
||||
ac_x_includes=no ac_x_libraries=no
|
||||
-_AC_PATH_X_XMKMF
|
||||
_AC_PATH_X_DIRECT
|
||||
case $ac_x_includes,$ac_x_libraries in #(
|
||||
no,* | *,no | *\'*)
|
|
@ -1,126 +0,0 @@
|
|||
Index: autoconf-2.59/bin/autoheader.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500
|
||||
+++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500
|
||||
@@ -1,8 +1,8 @@
|
||||
-#! @PERL@
|
||||
+#! @bindir@/env perl
|
||||
# -*- Perl -*-
|
||||
# @configure_input@
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
# autoheader -- create `config.h.in' from `configure.ac'
|
||||
Index: autoconf-2.59/bin/autom4te.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500
|
||||
+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500
|
||||
@@ -1,8 +1,10 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @bindir@/env perl
|
||||
# -*- perl -*-
|
||||
# @configure_input@
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+use warnings;
|
||||
+
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
# autom4te - Wrapper around M4 libraries.
|
||||
@@ -87,7 +89,7 @@
|
||||
my $freeze = 0;
|
||||
|
||||
# $M4.
|
||||
-my $m4 = $ENV{"M4"} || '@M4@';
|
||||
+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
|
||||
# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
|
||||
fatal "need GNU m4 1.4 or later: $m4"
|
||||
if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
|
||||
Index: autoconf-2.59/bin/autoreconf.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500
|
||||
+++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500
|
||||
@@ -1,8 +1,10 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @bindir@/env perl
|
||||
# -*- perl -*-
|
||||
# @configure_input@
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+use warnings;
|
||||
+
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
# autoreconf - install the GNU Build System in a directory tree
|
||||
Index: autoconf-2.59/bin/autoscan.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400
|
||||
+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @bindir@/env perl
|
||||
# -*- perl -*-
|
||||
# autoscan - Create configure.scan (a preliminary configure.ac) for a package.
|
||||
# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
|
||||
@@ -21,7 +21,9 @@
|
||||
|
||||
# Written by David MacKenzie <djm@gnu.ai.mit.edu>.
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+use warnings;
|
||||
+
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
BEGIN
|
||||
Index: autoconf-2.59/bin/autoupdate.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400
|
||||
+++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @bindir@/env perl
|
||||
# -*- perl -*-
|
||||
# autoupdate - modernize an Autoconf file.
|
||||
# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
|
||||
@@ -22,7 +22,9 @@
|
||||
# Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
|
||||
# Rewritten by Akim Demaille <akim@freefriends.org>.
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+use warnings;
|
||||
+
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
BEGIN
|
||||
@@ -54,7 +56,7 @@
|
||||
my @include = ('@datadir@');
|
||||
my $force = 0;
|
||||
# m4.
|
||||
-my $m4 = $ENV{"M4"} || '@M4@';
|
||||
+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
|
||||
|
||||
|
||||
# $HELP
|
||||
Index: autoconf-2.59/bin/ifnames.in
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400
|
||||
+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500
|
||||
@@ -1,8 +1,10 @@
|
||||
-#! @PERL@ -w
|
||||
+#! @bindir@/env perl
|
||||
# -*- perl -*-
|
||||
# @configure_input@
|
||||
|
||||
-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
+use warnings;
|
||||
+
|
||||
+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
|
||||
if 0;
|
||||
|
||||
# ifnames - print the identifiers used in C preprocessor conditionals
|
|
@ -1,19 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- autoconf-2.57/lib/autoconf/general.m4~program_prefix
|
||||
+++ autoconf-2.57/lib/autoconf/general.m4
|
||||
@@ -1676,8 +1676,9 @@
|
||||
# The aliases save the names the user supplied, while $host etc.
|
||||
# will get canonicalized.
|
||||
test -n "$target_alias" &&
|
||||
- test "$program_prefix$program_suffix$program_transform_name" = \
|
||||
- NONENONEs,x,x, &&
|
||||
+ test "$target_alias" != "$host_alias" &&
|
||||
+ test "$program_prefix$program_suffix$program_transform_name" = \
|
||||
+ NONENONEs,x,x, &&
|
||||
program_prefix=${target_alias}-[]dnl
|
||||
])# AC_CANONICAL_TARGET
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
Index: autoconf-2.59/lib/autoconf/types.m4
|
||||
===================================================================
|
||||
--- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200
|
||||
+++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200
|
||||
@@ -380,26 +380,66 @@
|
||||
# Generic checks. #
|
||||
# ---------------- #
|
||||
|
||||
+# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
|
||||
+# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
|
||||
+# ------------------------------------------------------------------------
|
||||
+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
|
||||
+AC_DEFUN([AC_CHECK_TARGET_TOOL],
|
||||
+[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
|
||||
+AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
|
||||
+if test -z "$ac_cv_prog_$1"; then
|
||||
+ if test "$build" = "$target"; then
|
||||
+ ac_ct_$1=$$1
|
||||
+ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
|
||||
+ $1=ac_ct_$1
|
||||
+ else
|
||||
+ $1="$3"
|
||||
+ fi
|
||||
+else
|
||||
+ $1="$ac_cv_prog_$1"
|
||||
+fi
|
||||
+])# AC_CHECK_TARGET_TOOL
|
||||
+
|
||||
+
|
||||
+AC_DEFUN([AC_PROG_SIZE],
|
||||
+[
|
||||
+ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
|
||||
+])
|
||||
|
||||
# AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
|
||||
# ---------------------------------------------------------------
|
||||
AC_DEFUN([AC_CHECK_SIZEOF],
|
||||
-[AS_LITERAL_IF([$1], [],
|
||||
+[AC_REQUIRE([AC_PROG_SIZE])
|
||||
+AC_REQUIRE([AC_PROG_AWK])
|
||||
+ AS_LITERAL_IF([$1], [],
|
||||
[AC_FATAL([$0: requires literal arguments])])dnl
|
||||
AC_CHECK_TYPE([$1], [], [], [$3])
|
||||
AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]),
|
||||
-[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
|
||||
- # The cast to unsigned long works around a bug in the HP C Compiler
|
||||
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
||||
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
- # This bug is HP SR number 8606223364.
|
||||
- _AC_COMPUTE_INT([(long) (sizeof ($1))],
|
||||
- [AS_TR_SH([ac_cv_sizeof_$1])],
|
||||
- [AC_INCLUDES_DEFAULT([$3])],
|
||||
- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
|
||||
+[
|
||||
+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
|
||||
+ if test "$cross_compiling" = yes; then
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
|
||||
+ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
|
||||
+ [
|
||||
+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
|
||||
+ ],
|
||||
+ [
|
||||
+ AS_TR_SH([ac_cv_sizeof_$1])=0
|
||||
+ ])
|
||||
+ else
|
||||
+ # The cast to unsigned long works around a bug in the HP C Compiler
|
||||
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
|
||||
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
|
||||
+ # This bug is HP SR number 8606223364.
|
||||
+ _AC_COMPUTE_INT([(long) (sizeof ($1))],
|
||||
+ [AS_TR_SH([ac_cv_sizeof_$1])],
|
||||
+ [AC_INCLUDES_DEFAULT([$3])],
|
||||
+ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
|
||||
+ fi
|
||||
else
|
||||
AS_TR_SH([ac_cv_sizeof_$1])=0
|
||||
-fi])dnl
|
||||
+fi
|
||||
+])dnl
|
||||
AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
|
||||
[The size of a `$1', as computed by sizeof.])
|
||||
])# AC_CHECK_SIZEOF
|
|
@ -1,25 +0,0 @@
|
|||
require autoconf.inc
|
||||
|
||||
PR = "r1"
|
||||
|
||||
LICENSE = "GPLv2"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
DEPENDS += "m4-native"
|
||||
RDEPENDS_${PN} = "m4 gnu-config"
|
||||
|
||||
SRC_URI += "file://autoreconf-include.patch;patch=1 \
|
||||
file://autoreconf-exclude.patch;patch=1 \
|
||||
file://autoreconf-foreign.patch;patch=1 \
|
||||
file://autoreconf-gnuconfigize.patch;patch=1 \
|
||||
file://autoheader-nonfatal-warnings.patch;patch=1 \
|
||||
file://config-site.patch;patch=1 \
|
||||
${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
|
||||
|
||||
DEPENDS_virtclass-native = "m4-native gnu-config-native"
|
||||
RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
|
||||
|
||||
SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
|
@ -15,8 +15,6 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
|
|||
${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \
|
||||
file://config_site.patch;patch=1"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
DEPENDS_virtclass-native = "m4-native gnu-config-native"
|
||||
RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
|
||||
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
require automake.inc
|
||||
|
||||
DEPENDS = "autoconf-native"
|
||||
RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
|
||||
|
||||
inherit native
|
|
@ -1 +0,0 @@
|
|||
require automake-native.inc
|
|
@ -1,39 +0,0 @@
|
|||
require automake.inc
|
||||
|
||||
RDEPENDS_automake += "\
|
||||
autoconf \
|
||||
perl \
|
||||
perl-module-bytes \
|
||||
perl-module-constant \
|
||||
perl-module-cwd \
|
||||
perl-module-data-dumper \
|
||||
perl-module-dynaloader \
|
||||
perl-module-errno \
|
||||
perl-module-exporter-heavy \
|
||||
perl-module-file-basename \
|
||||
perl-module-file-compare \
|
||||
perl-module-file-copy \
|
||||
perl-module-file-glob \
|
||||
perl-module-file-spec-unix \
|
||||
perl-module-file-stat \
|
||||
perl-module-getopt-long \
|
||||
perl-module-io \
|
||||
perl-module-io-file \
|
||||
perl-module-posix \
|
||||
perl-module-strict \
|
||||
perl-module-text-parsewords \
|
||||
perl-module-vars "
|
||||
|
||||
SRC_URI += "file://path_prog_fixes.patch;patch=1"
|
||||
|
||||
NATIVE_INSTALL_WORKS = "1"
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
install -d ${D}${datadir}
|
||||
if [ ! -e ${D}${datadir}/aclocal ]; then
|
||||
ln -sf aclocal-1.10 ${D}${datadir}/aclocal
|
||||
fi
|
||||
if [ ! -e ${D}${datadir}/automake ]; then
|
||||
ln -sf automake-1.10 ${D}${datadir}/automake
|
||||
fi
|
||||
}
|
|
@ -37,14 +37,6 @@ NATIVE_INSTALL_WORKS = "1"
|
|||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
install -d ${D}${datadir}
|
||||
if [ ! -e ${D}${datadir}/aclocal ]; then
|
||||
ln -sf aclocal-1.10 ${D}${datadir}/aclocal
|
||||
fi
|
||||
if [ ! -e ${D}${datadir}/automake ]; then
|
||||
ln -sf automake-1.10 ${D}${datadir}/automake
|
||||
fi
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
|
Loading…
Reference in New Issue