diff options
18 files changed, 0 insertions, 1079 deletions
diff --git a/meta/packages/autoconf/autoconf-2.61/autoconf-x.patch b/meta/packages/autoconf/autoconf-2.61/autoconf-x.patch deleted file mode 100644 index 596535b7d6..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoconf-x.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | Index: lib/autoconf/libs.m4 | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v | ||
| 4 | retrieving revision 1.13 | ||
| 5 | diff -p -u -r1.13 libs.m4 | ||
| 6 | --- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 | ||
| 7 | +++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 | ||
| 8 | @@ -265,13 +265,13 @@ ac_x_header_dirs=' | ||
| 9 | /usr/openwin/share/include' | ||
| 10 | |||
| 11 | if test "$ac_x_includes" = no; then | ||
| 12 | - # Guess where to find include files, by looking for Intrinsic.h. | ||
| 13 | + # Guess where to find include files, by looking for Xlib.h. | ||
| 14 | # First, try using that file with no special directory specified. | ||
| 15 | - AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], | ||
| 16 | + AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])], | ||
| 17 | [# We can compile using X headers with no special include directory. | ||
| 18 | ac_x_includes=], | ||
| 19 | [for ac_dir in $ac_x_header_dirs; do | ||
| 20 | - if test -r "$ac_dir/X11/Intrinsic.h"; then | ||
| 21 | + if test -r "$ac_dir/X11/Xlib.h"; then | ||
| 22 | ac_x_includes=$ac_dir | ||
| 23 | break | ||
| 24 | fi | ||
| 25 | @@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then | ||
| 26 | # Don't add to $LIBS permanently. | ||
| 27 | ac_save_LIBS=$LIBS | ||
| 28 | - LIBS="-lXt $LIBS" | ||
| 29 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], | ||
| 30 | - [XtMalloc (0)])], | ||
| 31 | + LIBS="-lX11 $LIBS" | ||
| 32 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>], | ||
| 33 | + [XrmInitialize ()])], | ||
| 34 | [LIBS=$ac_save_LIBS | ||
| 35 | # We can link X programs with no special library path. | ||
| 36 | ac_x_libraries=], | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch b/meta/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch deleted file mode 100644 index 2adda7403d..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoconf259-update-configscripts.patch +++ /dev/null | |||
| @@ -1,393 +0,0 @@ | |||
| 1 | --- autoconf-2.59/build-aux/config.guess.old 2003-10-23 10:28:51.000000000 -0400 | ||
| 2 | +++ autoconf-2.59/build-aux/config.guess 2004-04-24 22:36:28.000000000 -0400 | ||
| 3 | @@ -3,7 +3,7 @@ | ||
| 4 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | ||
| 5 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | ||
| 6 | |||
| 7 | -timestamp='2003-10-03' | ||
| 8 | +timestamp='2004-03-12' | ||
| 9 | |||
| 10 | # This file is free software; you can redistribute it and/or modify it | ||
| 11 | # under the terms of the GNU General Public License as published by | ||
| 12 | @@ -197,12 +197,18 @@ | ||
| 13 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | ||
| 14 | echo "${machine}-${os}${release}" | ||
| 15 | exit 0 ;; | ||
| 16 | + amd64:OpenBSD:*:*) | ||
| 17 | + echo x86_64-unknown-openbsd${UNAME_RELEASE} | ||
| 18 | + exit 0 ;; | ||
| 19 | amiga:OpenBSD:*:*) | ||
| 20 | echo m68k-unknown-openbsd${UNAME_RELEASE} | ||
| 21 | exit 0 ;; | ||
| 22 | arc:OpenBSD:*:*) | ||
| 23 | echo mipsel-unknown-openbsd${UNAME_RELEASE} | ||
| 24 | exit 0 ;; | ||
| 25 | + cats:OpenBSD:*:*) | ||
| 26 | + echo arm-unknown-openbsd${UNAME_RELEASE} | ||
| 27 | + exit 0 ;; | ||
| 28 | hp300:OpenBSD:*:*) | ||
| 29 | echo m68k-unknown-openbsd${UNAME_RELEASE} | ||
| 30 | exit 0 ;; | ||
| 31 | @@ -221,6 +227,9 @@ | ||
| 32 | mvmeppc:OpenBSD:*:*) | ||
| 33 | echo powerpc-unknown-openbsd${UNAME_RELEASE} | ||
| 34 | exit 0 ;; | ||
| 35 | + pegasos:OpenBSD:*:*) | ||
| 36 | + echo powerpc-unknown-openbsd${UNAME_RELEASE} | ||
| 37 | + exit 0 ;; | ||
| 38 | pmax:OpenBSD:*:*) | ||
| 39 | echo mipsel-unknown-openbsd${UNAME_RELEASE} | ||
| 40 | exit 0 ;; | ||
| 41 | @@ -236,10 +245,24 @@ | ||
| 42 | *:OpenBSD:*:*) | ||
| 43 | echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} | ||
| 44 | exit 0 ;; | ||
| 45 | + *:ekkoBSD:*:*) | ||
| 46 | + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} | ||
| 47 | + exit 0 ;; | ||
| 48 | + macppc:MirBSD:*:*) | ||
| 49 | + echo powerppc-unknown-mirbsd${UNAME_RELEASE} | ||
| 50 | + exit 0 ;; | ||
| 51 | + *:MirBSD:*:*) | ||
| 52 | + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} | ||
| 53 | + exit 0 ;; | ||
| 54 | alpha:OSF1:*:*) | ||
| 55 | - if test $UNAME_RELEASE = "V4.0"; then | ||
| 56 | + case $UNAME_RELEASE in | ||
| 57 | + *4.0) | ||
| 58 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | ||
| 59 | - fi | ||
| 60 | + ;; | ||
| 61 | + *5.*) | ||
| 62 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` | ||
| 63 | + ;; | ||
| 64 | + esac | ||
| 65 | # According to Compaq, /usr/sbin/psrinfo has been available on | ||
| 66 | # OSF/1 and Tru64 systems produced since 1995. I hope that | ||
| 67 | # covers most systems running today. This code pipes the CPU | ||
| 68 | @@ -277,11 +300,12 @@ | ||
| 69 | "EV7.9 (21364A)") | ||
| 70 | UNAME_MACHINE="alphaev79" ;; | ||
| 71 | esac | ||
| 72 | + # A Pn.n version is a patched version. | ||
| 73 | # A Vn.n version is a released version. | ||
| 74 | # A Tn.n version is a released field test version. | ||
| 75 | # A Xn.n version is an unreleased experimental baselevel. | ||
| 76 | # 1.2 uses "1.2" for uname -r. | ||
| 77 | - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | ||
| 78 | + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | ||
| 79 | exit 0 ;; | ||
| 80 | Alpha*:OpenVMS:*:*) | ||
| 81 | echo alpha-hp-vms | ||
| 82 | @@ -307,6 +331,9 @@ | ||
| 83 | *:OS/390:*:*) | ||
| 84 | echo i370-ibm-openedition | ||
| 85 | exit 0 ;; | ||
| 86 | + *:OS400:*:*) | ||
| 87 | + echo powerpc-ibm-os400 | ||
| 88 | + exit 0 ;; | ||
| 89 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | ||
| 90 | echo arm-acorn-riscix${UNAME_RELEASE} | ||
| 91 | exit 0;; | ||
| 92 | @@ -399,6 +426,9 @@ | ||
| 93 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | ||
| 94 | echo m68k-unknown-mint${UNAME_RELEASE} | ||
| 95 | exit 0 ;; | ||
| 96 | + m68k:machten:*:*) | ||
| 97 | + echo m68k-apple-machten${UNAME_RELEASE} | ||
| 98 | + exit 0 ;; | ||
| 99 | powerpc:machten:*:*) | ||
| 100 | echo powerpc-apple-machten${UNAME_RELEASE} | ||
| 101 | exit 0 ;; | ||
| 102 | @@ -742,6 +772,11 @@ | ||
| 103 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | ||
| 104 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | ||
| 105 | exit 0 ;; | ||
| 106 | + 5000:UNIX_System_V:4.*:*) | ||
| 107 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | ||
| 108 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` | ||
| 109 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | ||
| 110 | + exit 0 ;; | ||
| 111 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | ||
| 112 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | ||
| 113 | exit 0 ;; | ||
| 114 | @@ -751,7 +786,7 @@ | ||
| 115 | *:BSD/OS:*:*) | ||
| 116 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | ||
| 117 | exit 0 ;; | ||
| 118 | - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) | ||
| 119 | + *:FreeBSD:*:*) | ||
| 120 | # Determine whether the default compiler uses glibc. | ||
| 121 | eval $set_cc_for_build | ||
| 122 | sed 's/^ //' << EOF >$dummy.c | ||
| 123 | @@ -763,7 +798,7 @@ | ||
| 124 | #endif | ||
| 125 | EOF | ||
| 126 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` | ||
| 127 | - # GNU/FreeBSD systems have a "k" prefix to indicate we are using | ||
| 128 | + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using | ||
| 129 | # FreeBSD's kernel, but not the complete OS. | ||
| 130 | case ${LIBC} in gnu) kernel_only='k' ;; esac | ||
| 131 | echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} | ||
| 132 | @@ -799,8 +834,13 @@ | ||
| 133 | echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | ||
| 134 | exit 0 ;; | ||
| 135 | *:GNU:*:*) | ||
| 136 | + # the GNU system | ||
| 137 | echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` | ||
| 138 | exit 0 ;; | ||
| 139 | + *:GNU/*:*:*) | ||
| 140 | + # other systems with GNU libc and userland | ||
| 141 | + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu | ||
| 142 | + exit 0 ;; | ||
| 143 | i*86:Minix:*:*) | ||
| 144 | echo ${UNAME_MACHINE}-pc-minix | ||
| 145 | exit 0 ;; | ||
| 146 | @@ -813,6 +853,9 @@ | ||
| 147 | ia64:Linux:*:*) | ||
| 148 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 149 | exit 0 ;; | ||
| 150 | + m32r*:Linux:*:*) | ||
| 151 | + echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 152 | + exit 0 ;; | ||
| 153 | m68*:Linux:*:*) | ||
| 154 | echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 155 | exit 0 ;; | ||
| 156 | @@ -981,6 +1024,9 @@ | ||
| 157 | i*86:atheos:*:*) | ||
| 158 | echo ${UNAME_MACHINE}-unknown-atheos | ||
| 159 | exit 0 ;; | ||
| 160 | + i*86:syllable:*:*) | ||
| 161 | + echo ${UNAME_MACHINE}-pc-syllable | ||
| 162 | + exit 0 ;; | ||
| 163 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | ||
| 164 | echo i386-unknown-lynxos${UNAME_RELEASE} | ||
| 165 | exit 0 ;; | ||
| 166 | @@ -1052,7 +1098,7 @@ | ||
| 167 | exit 0 ;; | ||
| 168 | M68*:*:R3V[567]*:*) | ||
| 169 | test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; | ||
| 170 | - 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) | ||
| 171 | + 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) | ||
| 172 | OS_REL='' | ||
| 173 | test -r /etc/.relid \ | ||
| 174 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | ||
| 175 | @@ -1167,7 +1213,7 @@ | ||
| 176 | *:QNX:*:4*) | ||
| 177 | echo i386-pc-qnx | ||
| 178 | exit 0 ;; | ||
| 179 | - NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) | ||
| 180 | + NSR-?:NONSTOP_KERNEL:*:*) | ||
| 181 | echo nsr-tandem-nsk${UNAME_RELEASE} | ||
| 182 | exit 0 ;; | ||
| 183 | *:NonStop-UX:*:*) | ||
| 184 | @@ -1211,6 +1257,9 @@ | ||
| 185 | SEI:*:*:SEIUX) | ||
| 186 | echo mips-sei-seiux${UNAME_RELEASE} | ||
| 187 | exit 0 ;; | ||
| 188 | + *:DragonFly:*:*) | ||
| 189 | + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | ||
| 190 | + exit 0 ;; | ||
| 191 | esac | ||
| 192 | |||
| 193 | #echo '(No uname command or uname output not recognized.)' 1>&2 | ||
| 194 | --- autoconf-2.59/build-aux/config.sub.old 2003-10-23 10:28:51.000000000 -0400 | ||
| 195 | +++ autoconf-2.59/build-aux/config.sub 2004-04-24 22:36:28.000000000 -0400 | ||
| 196 | @@ -3,7 +3,7 @@ | ||
| 197 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | ||
| 198 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | ||
| 199 | |||
| 200 | -timestamp='2003-08-18' | ||
| 201 | +timestamp='2004-03-12' | ||
| 202 | |||
| 203 | # This file is (in principle) common to ALL GNU software. | ||
| 204 | # The presence of a machine in this file suggests that SOME GNU software | ||
| 205 | @@ -118,7 +118,8 @@ | ||
| 206 | # Here we must recognize all the valid KERNEL-OS combinations. | ||
| 207 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | ||
| 208 | case $maybe_os in | ||
| 209 | - nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | ||
| 210 | + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ | ||
| 211 | + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | ||
| 212 | os=-$maybe_os | ||
| 213 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | ||
| 214 | ;; | ||
| 215 | @@ -236,7 +237,7 @@ | ||
| 216 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | ||
| 217 | | i370 | i860 | i960 | ia64 \ | ||
| 218 | | ip2k | iq2000 \ | ||
| 219 | - | m32r | m68000 | m68k | m88k | mcore \ | ||
| 220 | + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | ||
| 221 | | mips | mipsbe | mipseb | mipsel | mipsle \ | ||
| 222 | | mips16 \ | ||
| 223 | | mips64 | mips64el \ | ||
| 224 | @@ -261,7 +262,7 @@ | ||
| 225 | | pyramid \ | ||
| 226 | | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | ||
| 227 | | sh64 | sh64le \ | ||
| 228 | - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | ||
| 229 | + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | ||
| 230 | | strongarm \ | ||
| 231 | | tahoe | thumb | tic4x | tic80 | tron \ | ||
| 232 | | v850 | v850e \ | ||
| 233 | @@ -307,7 +308,7 @@ | ||
| 234 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | ||
| 235 | | i*86-* | i860-* | i960-* | ia64-* \ | ||
| 236 | | ip2k-* | iq2000-* \ | ||
| 237 | - | m32r-* \ | ||
| 238 | + | m32r-* | m32rle-* \ | ||
| 239 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | ||
| 240 | | m88110-* | m88k-* | mcore-* \ | ||
| 241 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | ||
| 242 | @@ -335,7 +336,7 @@ | ||
| 243 | | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | ||
| 244 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | ||
| 245 | | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | ||
| 246 | - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | ||
| 247 | + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | ||
| 248 | | tahoe-* | thumb-* \ | ||
| 249 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | ||
| 250 | | tron-* \ | ||
| 251 | @@ -362,6 +363,9 @@ | ||
| 252 | basic_machine=a29k-amd | ||
| 253 | os=-udi | ||
| 254 | ;; | ||
| 255 | + abacus) | ||
| 256 | + basic_machine=abacus-unknown | ||
| 257 | + ;; | ||
| 258 | adobe68k) | ||
| 259 | basic_machine=m68010-adobe | ||
| 260 | os=-scout | ||
| 261 | @@ -379,6 +383,9 @@ | ||
| 262 | amd64) | ||
| 263 | basic_machine=x86_64-pc | ||
| 264 | ;; | ||
| 265 | + amd64-*) | ||
| 266 | + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
| 267 | + ;; | ||
| 268 | amdahl) | ||
| 269 | basic_machine=580-amdahl | ||
| 270 | os=-sysv | ||
| 271 | @@ -438,12 +445,20 @@ | ||
| 272 | basic_machine=j90-cray | ||
| 273 | os=-unicos | ||
| 274 | ;; | ||
| 275 | + cr16c) | ||
| 276 | + basic_machine=cr16c-unknown | ||
| 277 | + os=-elf | ||
| 278 | + ;; | ||
| 279 | crds | unos) | ||
| 280 | basic_machine=m68k-crds | ||
| 281 | ;; | ||
| 282 | cris | cris-* | etrax*) | ||
| 283 | basic_machine=cris-axis | ||
| 284 | ;; | ||
| 285 | + crx) | ||
| 286 | + basic_machine=crx-unknown | ||
| 287 | + os=-elf | ||
| 288 | + ;; | ||
| 289 | da30 | da30-*) | ||
| 290 | basic_machine=m68k-da30 | ||
| 291 | ;; | ||
| 292 | @@ -743,6 +758,10 @@ | ||
| 293 | basic_machine=or32-unknown | ||
| 294 | os=-coff | ||
| 295 | ;; | ||
| 296 | + os400) | ||
| 297 | + basic_machine=powerpc-ibm | ||
| 298 | + os=-os400 | ||
| 299 | + ;; | ||
| 300 | OSE68000 | ose68000) | ||
| 301 | basic_machine=m68000-ericsson | ||
| 302 | os=-ose | ||
| 303 | @@ -963,6 +982,10 @@ | ||
| 304 | tower | tower-32) | ||
| 305 | basic_machine=m68k-ncr | ||
| 306 | ;; | ||
| 307 | + tpf) | ||
| 308 | + basic_machine=s390x-ibm | ||
| 309 | + os=-tpf | ||
| 310 | + ;; | ||
| 311 | udi29k) | ||
| 312 | basic_machine=a29k-amd | ||
| 313 | os=-udi | ||
| 314 | @@ -1058,7 +1081,7 @@ | ||
| 315 | sh64) | ||
| 316 | basic_machine=sh64-unknown | ||
| 317 | ;; | ||
| 318 | - sparc | sparcv9 | sparcv9b) | ||
| 319 | + sparc | sparcv8 | sparcv9 | sparcv9b) | ||
| 320 | basic_machine=sparc-sun | ||
| 321 | ;; | ||
| 322 | cydra) | ||
| 323 | @@ -1131,19 +1154,20 @@ | ||
| 324 | | -aos* \ | ||
| 325 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | ||
| 326 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | ||
| 327 | - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ | ||
| 328 | - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | ||
| 329 | + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ | ||
| 330 | + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | ||
| 331 | + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | ||
| 332 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | ||
| 333 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | ||
| 334 | | -chorusos* | -chorusrdb* \ | ||
| 335 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | ||
| 336 | - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
| 337 | + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
| 338 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | ||
| 339 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | ||
| 340 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | ||
| 341 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | ||
| 342 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | ||
| 343 | - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) | ||
| 344 | + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) | ||
| 345 | # Remember, each alternative MUST END IN *, to match a version number. | ||
| 346 | ;; | ||
| 347 | -qnx*) | ||
| 348 | @@ -1182,6 +1206,9 @@ | ||
| 349 | -opened*) | ||
| 350 | os=-openedition | ||
| 351 | ;; | ||
| 352 | + -os400*) | ||
| 353 | + os=-os400 | ||
| 354 | + ;; | ||
| 355 | -wince*) | ||
| 356 | os=-wince | ||
| 357 | ;; | ||
| 358 | @@ -1203,6 +1230,9 @@ | ||
| 359 | -atheos*) | ||
| 360 | os=-atheos | ||
| 361 | ;; | ||
| 362 | + -syllable*) | ||
| 363 | + os=-syllable | ||
| 364 | + ;; | ||
| 365 | -386bsd) | ||
| 366 | os=-bsd | ||
| 367 | ;; | ||
| 368 | @@ -1225,6 +1255,9 @@ | ||
| 369 | -sinix*) | ||
| 370 | os=-sysv4 | ||
| 371 | ;; | ||
| 372 | + -tpf*) | ||
| 373 | + os=-tpf | ||
| 374 | + ;; | ||
| 375 | -triton*) | ||
| 376 | os=-sysv3 | ||
| 377 | ;; | ||
| 378 | @@ -1473,9 +1506,15 @@ | ||
| 379 | -mvs* | -opened*) | ||
| 380 | vendor=ibm | ||
| 381 | ;; | ||
| 382 | + -os400*) | ||
| 383 | + vendor=ibm | ||
| 384 | + ;; | ||
| 385 | -ptx*) | ||
| 386 | vendor=sequent | ||
| 387 | ;; | ||
| 388 | + -tpf*) | ||
| 389 | + vendor=ibm | ||
| 390 | + ;; | ||
| 391 | -vxsim* | -vxworks* | -windiss*) | ||
| 392 | vendor=wrs | ||
| 393 | ;; | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch b/meta/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch deleted file mode 100644 index 1f18e04bba..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoheader-nonfatal-warnings.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | --- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 | ||
| 2 | +++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 | ||
| 3 | @@ -272,8 +272,8 @@ | ||
| 4 | } | ||
| 5 | |||
| 6 | } | ||
| 7 | - exit 1 | ||
| 8 | - if keys %symbol; | ||
| 9 | +# exit 1 | ||
| 10 | +# if keys %symbol; | ||
| 11 | } | ||
| 12 | |||
| 13 | update_file ("$tmp/config.hin", "$config_h_in"); | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch b/meta/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch deleted file mode 100644 index ab85fae337..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoreconf-exclude.patch +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 1 | Index: autoconf-2.61/bin/autoreconf.in | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:25:59.000000000 +0100 | ||
| 4 | +++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:33:11.000000000 +0100 | ||
| 5 | @@ -76,6 +76,7 @@ | ||
| 6 | -i, --install copy missing auxiliary files | ||
| 7 | --no-recursive don't rebuild sub-packages | ||
| 8 | -s, --symlink with -i, install symbolic links instead of copies | ||
| 9 | + -x, --exclude=STEPS steps we should not run | ||
| 10 | -m, --make when applicable, re-run ./configure && make | ||
| 11 | -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] | ||
| 12 | |||
| 13 | @@ -134,6 +135,13 @@ | ||
| 14 | # Recurse into subpackages | ||
| 15 | my $recursive = 1; | ||
| 16 | |||
| 17 | +# Steps to exclude | ||
| 18 | +my @exclude; | ||
| 19 | +my @ex; | ||
| 20 | + | ||
| 21 | +my $uses_gettext; | ||
| 22 | +my $configure_ac; | ||
| 23 | + | ||
| 24 | ## ---------- ## | ||
| 25 | ## Routines. ## | ||
| 26 | ## ---------- ## | ||
| 27 | @@ -151,6 +159,7 @@ | ||
| 28 | 'B|prepend-include=s' => \@prepend_include, | ||
| 29 | 'i|install' => \$install, | ||
| 30 | 's|symlink' => \$symlink, | ||
| 31 | + 'x|exclude=s' => \@exclude, | ||
| 32 | 'm|make' => \$make, | ||
| 33 | 'recursive!' => \$recursive); | ||
| 34 | |||
| 35 | @@ -160,6 +169,8 @@ | ||
| 36 | parse_WARNINGS; | ||
| 37 | parse_warnings '--warnings', @warning; | ||
| 38 | |||
| 39 | + @exclude = map { split /,/ } @exclude; | ||
| 40 | + | ||
| 41 | # Even if the user specified a configure.ac, trim to get the | ||
| 42 | # directory, and look for configure.ac again. Because (i) the code | ||
| 43 | # is simpler, and (ii) we are still able to diagnose simultaneous | ||
| 44 | @@ -253,6 +264,11 @@ | ||
| 45 | { | ||
| 46 | my ($aclocal, $flags) = @_; | ||
| 47 | |||
| 48 | + @ex = grep (/^aclocal$/, @exclude); | ||
| 49 | + if ($#ex != -1) { | ||
| 50 | + return; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | # aclocal 1.8+ does all this for free. It can be recognized by its | ||
| 54 | # --force support. | ||
| 55 | if ($aclocal_supports_force) | ||
| 56 | @@ -366,7 +382,10 @@ | ||
| 57 | } | ||
| 58 | else | ||
| 59 | { | ||
| 60 | - xsystem "$autopoint"; | ||
| 61 | + @ex = grep (/^autopoint$/, @exclude); | ||
| 62 | + if ($#ex == -1) { | ||
| 63 | + xsystem ("$autopoint"); | ||
| 64 | + } | ||
| 65 | } | ||
| 66 | |||
| 67 | |||
| 68 | @@ -530,7 +549,10 @@ | ||
| 69 | { | ||
| 70 | $libtoolize .= " --ltdl"; | ||
| 71 | } | ||
| 72 | - xsystem ($libtoolize); | ||
| 73 | + @ex = grep (/^libtoolize$/, @exclude); | ||
| 74 | + if ($#ex == -1) { | ||
| 75 | + xsystem ("$libtoolize"); | ||
| 76 | + } | ||
| 77 | $rerun_aclocal = 1; | ||
| 78 | } | ||
| 79 | else | ||
| 80 | @@ -570,7 +592,10 @@ | ||
| 81 | # latter runs the former, and (ii) autoconf is stricter than | ||
| 82 | # autoheader. So all in all, autoconf should give better error | ||
| 83 | # messages. | ||
| 84 | - xsystem ($autoconf); | ||
| 85 | + @ex = grep (/^autoconf$/, @exclude); | ||
| 86 | + if ($#ex == -1) { | ||
| 87 | + xsystem ("$autoconf"); | ||
| 88 | + } | ||
| 89 | |||
| 90 | |||
| 91 | # -------------------- # | ||
| 92 | @@ -591,7 +616,10 @@ | ||
| 93 | } | ||
| 94 | else | ||
| 95 | { | ||
| 96 | - xsystem ($autoheader); | ||
| 97 | + @ex = grep (/^autoheader$/, @exclude); | ||
| 98 | + if ($#ex == -1) { | ||
| 99 | + xsystem ("$autoheader"); | ||
| 100 | + } | ||
| 101 | } | ||
| 102 | |||
| 103 | |||
| 104 | @@ -608,7 +636,10 @@ | ||
| 105 | # We should always run automake, and let it decide whether it shall | ||
| 106 | # update the file or not. In fact, the effect of `$force' is already | ||
| 107 | # included in `$automake' via `--no-force'. | ||
| 108 | - xsystem ($automake); | ||
| 109 | + @ex = grep (/^automake$/, @exclude); | ||
| 110 | + if ($#ex == -1) { | ||
| 111 | + xsystem ("$automake"); | ||
| 112 | + } | ||
| 113 | } | ||
| 114 | |||
| 115 | |||
| 116 | @@ -632,7 +663,10 @@ | ||
| 117 | } | ||
| 118 | else | ||
| 119 | { | ||
| 120 | - xsystem ("make"); | ||
| 121 | + @ex = grep (/^make$/, @exclude); | ||
| 122 | + if ($#ex == -1) { | ||
| 123 | + xsystem ("make"); | ||
| 124 | + } | ||
| 125 | } | ||
| 126 | } | ||
| 127 | } | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch b/meta/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch deleted file mode 100644 index 587a823826..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoreconf-foreign.patch +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | --- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 | ||
| 2 | +++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 | ||
| 3 | @@ -184,6 +184,8 @@ | ||
| 4 | |||
| 5 | $aclocal_supports_force = `$aclocal --help` =~ /--force/; | ||
| 6 | |||
| 7 | + $automake .= ' --foreign'; | ||
| 8 | + | ||
| 9 | # Dispatch autoreconf's option to the tools. | ||
| 10 | # --include; | ||
| 11 | $autoconf .= join (' --include=', '', @include); | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch b/meta/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch deleted file mode 100644 index c243ce0216..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoreconf-gnuconfigize.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | Index: autoconf-2.61/bin/autoreconf.in | ||
| 7 | =================================================================== | ||
| 8 | --- autoconf-2.61.orig/bin/autoreconf.in 2006-12-14 20:33:52.000000000 +0100 | ||
| 9 | +++ autoconf-2.61/bin/autoreconf.in 2006-12-14 20:34:28.000000000 +0100 | ||
| 10 | @@ -58,7 +58,7 @@ | ||
| 11 | $help = "Usage: $0 [OPTION] ... [DIRECTORY] ... | ||
| 12 | |||
| 13 | Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' | ||
| 14 | -(formerly `gettextize'), and `libtoolize' where appropriate) | ||
| 15 | +(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) | ||
| 16 | repeatedly to remake the GNU Build System files in specified | ||
| 17 | DIRECTORIES and their subdirectories (defaulting to `.'). | ||
| 18 | |||
| 19 | @@ -107,12 +107,13 @@ | ||
| 20 | "; | ||
| 21 | |||
| 22 | # Lib files. | ||
| 23 | -my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; | ||
| 24 | -my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; | ||
| 25 | -my $automake = $ENV{'AUTOMAKE'} || 'automake'; | ||
| 26 | -my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; | ||
| 27 | -my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; | ||
| 28 | -my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; | ||
| 29 | +my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; | ||
| 30 | +my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; | ||
| 31 | +my $automake = $ENV{'AUTOMAKE'} || 'automake'; | ||
| 32 | +my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; | ||
| 33 | +my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; | ||
| 34 | +my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; | ||
| 35 | +my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; | ||
| 36 | |||
| 37 | # --install -- as --add-missing in other tools. | ||
| 38 | my $install = 0; | ||
| 39 | @@ -644,6 +645,10 @@ | ||
| 40 | } | ||
| 41 | } | ||
| 42 | |||
| 43 | + @ex = grep (/^gnu-configize$/, @exclude); | ||
| 44 | + if ($#ex == -1) { | ||
| 45 | + xsystem ("$gnuconfigize"); | ||
| 46 | + } | ||
| 47 | |||
| 48 | # -------------- # | ||
| 49 | # Running make. # | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/autoreconf-include.patch b/meta/packages/autoconf/autoconf-2.61/autoreconf-include.patch deleted file mode 100644 index 5a7604b0fd..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/autoreconf-include.patch +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | --- autoconf/bin/autoreconf.in~ 2004-04-06 23:36:10.000000000 +0100 | ||
| 2 | +++ autoconf/bin/autoreconf.in 2004-04-08 20:51:57.000000000 +0100 | ||
| 3 | @@ -179,6 +179,7 @@ | ||
| 4 | $autoconf .= join (' --prepend-include=', '', @prepend_include); | ||
| 5 | $autoheader .= join (' --include=', '', @include); | ||
| 6 | $autoheader .= join (' --prepend-include=', '', @prepend_include); | ||
| 7 | + $aclocal .= join (' -I ', '', @include); | ||
| 8 | |||
| 9 | # --install and --symlink; | ||
| 10 | if ($install) | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/config-site.patch b/meta/packages/autoconf/autoconf-2.61/config-site.patch deleted file mode 100644 index 0fa49720c1..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/config-site.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Index: autoconf-2.61/lib/autoconf/general.m4 | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.61.orig/lib/autoconf/general.m4 2007-07-10 15:09:01.000000000 +0100 | ||
| 4 | +++ autoconf-2.61/lib/autoconf/general.m4 2007-07-10 15:09:17.000000000 +0100 | ||
| 5 | @@ -1767,7 +1767,7 @@ | ||
| 6 | m4_define([AC_SITE_LOAD], | ||
| 7 | [# Prefer explicitly selected file to automatically selected ones. | ||
| 8 | if test -n "$CONFIG_SITE"; then | ||
| 9 | - set x "$CONFIG_SITE" | ||
| 10 | + set x $CONFIG_SITE | ||
| 11 | elif test "x$prefix" != xNONE; then | ||
| 12 | set x "$prefix/share/config.site" "$prefix/etc/config.site" | ||
| 13 | else | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/fix_path_xtra.patch b/meta/packages/autoconf/autoconf-2.61/fix_path_xtra.patch deleted file mode 100644 index c3a2c4578a..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/fix_path_xtra.patch +++ /dev/null | |||
| @@ -1,114 +0,0 @@ | |||
| 1 | We don't build xmkmf so any values returned from it are going to be wrong. | ||
| 2 | Using any paths in /usr/ for x headers/libs is a bad idea when cross compiling. | ||
| 3 | This patch removes them to stop any confusion. | ||
| 4 | |||
| 5 | RP - 20071115 | ||
| 6 | |||
| 7 | Index: autoconf-2.61/lib/autoconf/libs.m4 | ||
| 8 | =================================================================== | ||
| 9 | --- autoconf-2.61.orig/lib/autoconf/libs.m4 2006-10-15 01:12:02.000000000 +0000 | ||
| 10 | +++ autoconf-2.61/lib/autoconf/libs.m4 2007-11-15 12:09:59.000000000 +0000 | ||
| 11 | @@ -180,53 +180,6 @@ | ||
| 12 | # --------------------- # | ||
| 13 | |||
| 14 | |||
| 15 | -# _AC_PATH_X_XMKMF | ||
| 16 | -# ---------------- | ||
| 17 | -# Internal subroutine of _AC_PATH_X. | ||
| 18 | -# Set ac_x_includes and/or ac_x_libraries. | ||
| 19 | -m4_define([_AC_PATH_X_XMKMF], | ||
| 20 | -[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl | ||
| 21 | -rm -f -r conftest.dir | ||
| 22 | -if mkdir conftest.dir; then | ||
| 23 | - cd conftest.dir | ||
| 24 | - cat >Imakefile <<'_ACEOF' | ||
| 25 | -incroot: | ||
| 26 | - @echo incroot='${INCROOT}' | ||
| 27 | -usrlibdir: | ||
| 28 | - @echo usrlibdir='${USRLIBDIR}' | ||
| 29 | -libdir: | ||
| 30 | - @echo libdir='${LIBDIR}' | ||
| 31 | -_ACEOF | ||
| 32 | - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then | ||
| 33 | - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | ||
| 34 | - for ac_var in incroot usrlibdir libdir; do | ||
| 35 | - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" | ||
| 36 | - done | ||
| 37 | - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. | ||
| 38 | - for ac_extension in a so sl; do | ||
| 39 | - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && | ||
| 40 | - test -f "$ac_im_libdir/libX11.$ac_extension"; then | ||
| 41 | - ac_im_usrlibdir=$ac_im_libdir; break | ||
| 42 | - fi | ||
| 43 | - done | ||
| 44 | - # Screen out bogus values from the imake configuration. They are | ||
| 45 | - # bogus both because they are the default anyway, and because | ||
| 46 | - # using them would break gcc on systems where it needs fixed includes. | ||
| 47 | - case $ac_im_incroot in | ||
| 48 | - /usr/include) ac_x_includes= ;; | ||
| 49 | - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; | ||
| 50 | - esac | ||
| 51 | - case $ac_im_usrlibdir in | ||
| 52 | - /usr/lib | /lib) ;; | ||
| 53 | - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; | ||
| 54 | - esac | ||
| 55 | - fi | ||
| 56 | - cd .. | ||
| 57 | - rm -f -r conftest.dir | ||
| 58 | -fi | ||
| 59 | -])# _AC_PATH_X_XMKMF | ||
| 60 | - | ||
| 61 | - | ||
| 62 | # _AC_PATH_X_DIRECT | ||
| 63 | # ----------------- | ||
| 64 | # Internal subroutine of _AC_PATH_X. | ||
| 65 | @@ -234,40 +187,7 @@ | ||
| 66 | m4_define([_AC_PATH_X_DIRECT], | ||
| 67 | [# Standard set of common directories for X headers. | ||
| 68 | # Check X11 before X11Rn because it is often a symlink to the current release. | ||
| 69 | -ac_x_header_dirs=' | ||
| 70 | -/usr/X11/include | ||
| 71 | -/usr/X11R6/include | ||
| 72 | -/usr/X11R5/include | ||
| 73 | -/usr/X11R4/include | ||
| 74 | - | ||
| 75 | -/usr/include/X11 | ||
| 76 | -/usr/include/X11R6 | ||
| 77 | -/usr/include/X11R5 | ||
| 78 | -/usr/include/X11R4 | ||
| 79 | - | ||
| 80 | -/usr/local/X11/include | ||
| 81 | -/usr/local/X11R6/include | ||
| 82 | -/usr/local/X11R5/include | ||
| 83 | -/usr/local/X11R4/include | ||
| 84 | - | ||
| 85 | -/usr/local/include/X11 | ||
| 86 | -/usr/local/include/X11R6 | ||
| 87 | -/usr/local/include/X11R5 | ||
| 88 | -/usr/local/include/X11R4 | ||
| 89 | - | ||
| 90 | -/usr/X386/include | ||
| 91 | -/usr/x386/include | ||
| 92 | -/usr/XFree86/include/X11 | ||
| 93 | - | ||
| 94 | -/usr/include | ||
| 95 | -/usr/local/include | ||
| 96 | -/usr/unsupported/include | ||
| 97 | -/usr/athena/include | ||
| 98 | -/usr/local/x11r5/include | ||
| 99 | -/usr/lpp/Xamples/include | ||
| 100 | - | ||
| 101 | -/usr/openwin/include | ||
| 102 | -/usr/openwin/share/include' | ||
| 103 | +ac_x_header_dirs='' | ||
| 104 | |||
| 105 | if test "$ac_x_includes" = no; then | ||
| 106 | # Guess where to find include files, by looking for Xlib.h. | ||
| 107 | @@ -316,7 +236,6 @@ | ||
| 108 | [AC_CACHE_VAL(ac_cv_have_x, | ||
| 109 | [# One or both of the vars are not set, and there is no cached value. | ||
| 110 | ac_x_includes=no ac_x_libraries=no | ||
| 111 | -_AC_PATH_X_XMKMF | ||
| 112 | _AC_PATH_X_DIRECT | ||
| 113 | case $ac_x_includes,$ac_x_libraries in #( | ||
| 114 | no,* | *,no | *\'*) | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/path_prog_fixes.patch b/meta/packages/autoconf/autoconf-2.61/path_prog_fixes.patch deleted file mode 100644 index 5f0d055a48..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/path_prog_fixes.patch +++ /dev/null | |||
| @@ -1,126 +0,0 @@ | |||
| 1 | Index: autoconf-2.59/bin/autoheader.in | ||
| 2 | =================================================================== | ||
| 3 | --- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 | ||
| 4 | +++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500 | ||
| 5 | @@ -1,8 +1,8 @@ | ||
| 6 | -#! @PERL@ | ||
| 7 | +#! @bindir@/env perl | ||
| 8 | # -*- Perl -*- | ||
| 9 | # @configure_input@ | ||
| 10 | |||
| 11 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 12 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac' | ||
| 13 | if 0; | ||
| 14 | |||
| 15 | # autoheader -- create `config.h.in' from `configure.ac' | ||
| 16 | Index: autoconf-2.59/bin/autom4te.in | ||
| 17 | =================================================================== | ||
| 18 | --- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500 | ||
| 19 | +++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 | ||
| 20 | @@ -1,8 +1,10 @@ | ||
| 21 | -#! @PERL@ -w | ||
| 22 | +#! @bindir@/env perl | ||
| 23 | # -*- perl -*- | ||
| 24 | # @configure_input@ | ||
| 25 | |||
| 26 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 27 | +use warnings; | ||
| 28 | + | ||
| 29 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 30 | if 0; | ||
| 31 | |||
| 32 | # autom4te - Wrapper around M4 libraries. | ||
| 33 | @@ -87,7 +89,7 @@ | ||
| 34 | my $freeze = 0; | ||
| 35 | |||
| 36 | # $M4. | ||
| 37 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 38 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 39 | # Some non-GNU m4's don't reject the --help option, so give them /dev/null. | ||
| 40 | fatal "need GNU m4 1.4 or later: $m4" | ||
| 41 | if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null"; | ||
| 42 | Index: autoconf-2.59/bin/autoreconf.in | ||
| 43 | =================================================================== | ||
| 44 | --- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 | ||
| 45 | +++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500 | ||
| 46 | @@ -1,8 +1,10 @@ | ||
| 47 | -#! @PERL@ -w | ||
| 48 | +#! @bindir@/env perl | ||
| 49 | # -*- perl -*- | ||
| 50 | # @configure_input@ | ||
| 51 | |||
| 52 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 53 | +use warnings; | ||
| 54 | + | ||
| 55 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 56 | if 0; | ||
| 57 | |||
| 58 | # autoreconf - install the GNU Build System in a directory tree | ||
| 59 | Index: autoconf-2.59/bin/autoscan.in | ||
| 60 | =================================================================== | ||
| 61 | --- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400 | ||
| 62 | +++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 | ||
| 63 | @@ -1,4 +1,4 @@ | ||
| 64 | -#! @PERL@ -w | ||
| 65 | +#! @bindir@/env perl | ||
| 66 | # -*- perl -*- | ||
| 67 | # autoscan - Create configure.scan (a preliminary configure.ac) for a package. | ||
| 68 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 69 | @@ -21,7 +21,9 @@ | ||
| 70 | |||
| 71 | # Written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 72 | |||
| 73 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 74 | +use warnings; | ||
| 75 | + | ||
| 76 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 77 | if 0; | ||
| 78 | |||
| 79 | BEGIN | ||
| 80 | Index: autoconf-2.59/bin/autoupdate.in | ||
| 81 | =================================================================== | ||
| 82 | --- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400 | ||
| 83 | +++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500 | ||
| 84 | @@ -1,4 +1,4 @@ | ||
| 85 | -#! @PERL@ -w | ||
| 86 | +#! @bindir@/env perl | ||
| 87 | # -*- perl -*- | ||
| 88 | # autoupdate - modernize an Autoconf file. | ||
| 89 | # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 | ||
| 90 | @@ -22,7 +22,9 @@ | ||
| 91 | # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>. | ||
| 92 | # Rewritten by Akim Demaille <akim@freefriends.org>. | ||
| 93 | |||
| 94 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 95 | +use warnings; | ||
| 96 | + | ||
| 97 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 98 | if 0; | ||
| 99 | |||
| 100 | BEGIN | ||
| 101 | @@ -54,7 +56,7 @@ | ||
| 102 | my @include = ('@datadir@'); | ||
| 103 | my $force = 0; | ||
| 104 | # m4. | ||
| 105 | -my $m4 = $ENV{"M4"} || '@M4@'; | ||
| 106 | +my $m4 = $ENV{"M4"} || '@bindir@/env m4'; | ||
| 107 | |||
| 108 | |||
| 109 | # $HELP | ||
| 110 | Index: autoconf-2.59/bin/ifnames.in | ||
| 111 | =================================================================== | ||
| 112 | --- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400 | ||
| 113 | +++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 | ||
| 114 | @@ -1,8 +1,10 @@ | ||
| 115 | -#! @PERL@ -w | ||
| 116 | +#! @bindir@/env perl | ||
| 117 | # -*- perl -*- | ||
| 118 | # @configure_input@ | ||
| 119 | |||
| 120 | -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 121 | +use warnings; | ||
| 122 | + | ||
| 123 | +eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' | ||
| 124 | if 0; | ||
| 125 | |||
| 126 | # ifnames - print the identifiers used in C preprocessor conditionals | ||
diff --git a/meta/packages/autoconf/autoconf-2.61/program_prefix.patch b/meta/packages/autoconf/autoconf-2.61/program_prefix.patch deleted file mode 100644 index e6f4096a97..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/program_prefix.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | --- autoconf-2.57/lib/autoconf/general.m4~program_prefix | ||
| 7 | +++ autoconf-2.57/lib/autoconf/general.m4 | ||
| 8 | @@ -1676,8 +1676,9 @@ | ||
| 9 | # The aliases save the names the user supplied, while $host etc. | ||
| 10 | # will get canonicalized. | ||
| 11 | test -n "$target_alias" && | ||
| 12 | - test "$program_prefix$program_suffix$program_transform_name" = \ | ||
| 13 | - NONENONEs,x,x, && | ||
| 14 | + test "$target_alias" != "$host_alias" && | ||
| 15 | + test "$program_prefix$program_suffix$program_transform_name" = \ | ||
| 16 | + NONENONEs,x,x, && | ||
| 17 | program_prefix=${target_alias}-[]dnl | ||
| 18 | ])# AC_CANONICAL_TARGET | ||
| 19 | |||
diff --git a/meta/packages/autoconf/autoconf-2.61/sizeof_types.patch b/meta/packages/autoconf/autoconf-2.61/sizeof_types.patch deleted file mode 100644 index 30fd5c1926..0000000000 --- a/meta/packages/autoconf/autoconf-2.61/sizeof_types.patch +++ /dev/null | |||
| @@ -1,87 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | Index: autoconf-2.59/lib/autoconf/types.m4 | ||
| 7 | =================================================================== | ||
| 8 | --- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200 | ||
| 9 | +++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200 | ||
| 10 | @@ -380,26 +380,66 @@ | ||
| 11 | # Generic checks. # | ||
| 12 | # ---------------- # | ||
| 13 | |||
| 14 | +# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60 | ||
| 15 | +# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH ) | ||
| 16 | +# ------------------------------------------------------------------------ | ||
| 17 | +# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.) | ||
| 18 | +AC_DEFUN([AC_CHECK_TARGET_TOOL], | ||
| 19 | +[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl | ||
| 20 | +AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4]) | ||
| 21 | +if test -z "$ac_cv_prog_$1"; then | ||
| 22 | + if test "$build" = "$target"; then | ||
| 23 | + ac_ct_$1=$$1 | ||
| 24 | + AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4]) | ||
| 25 | + $1=ac_ct_$1 | ||
| 26 | + else | ||
| 27 | + $1="$3" | ||
| 28 | + fi | ||
| 29 | +else | ||
| 30 | + $1="$ac_cv_prog_$1" | ||
| 31 | +fi | ||
| 32 | +])# AC_CHECK_TARGET_TOOL | ||
| 33 | + | ||
| 34 | + | ||
| 35 | +AC_DEFUN([AC_PROG_SIZE], | ||
| 36 | +[ | ||
| 37 | + AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH]) | ||
| 38 | +]) | ||
| 39 | |||
| 40 | # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) | ||
| 41 | # --------------------------------------------------------------- | ||
| 42 | AC_DEFUN([AC_CHECK_SIZEOF], | ||
| 43 | -[AS_LITERAL_IF([$1], [], | ||
| 44 | +[AC_REQUIRE([AC_PROG_SIZE]) | ||
| 45 | +AC_REQUIRE([AC_PROG_AWK]) | ||
| 46 | + AS_LITERAL_IF([$1], [], | ||
| 47 | [AC_FATAL([$0: requires literal arguments])])dnl | ||
| 48 | AC_CHECK_TYPE([$1], [], [], [$3]) | ||
| 49 | AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]), | ||
| 50 | -[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then | ||
| 51 | - # The cast to unsigned long works around a bug in the HP C Compiler | ||
| 52 | - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
| 53 | - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
| 54 | - # This bug is HP SR number 8606223364. | ||
| 55 | - _AC_COMPUTE_INT([(long) (sizeof ($1))], | ||
| 56 | - [AS_TR_SH([ac_cv_sizeof_$1])], | ||
| 57 | - [AC_INCLUDES_DEFAULT([$3])], | ||
| 58 | - [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) | ||
| 59 | +[ | ||
| 60 | +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then | ||
| 61 | + if test "$cross_compiling" = yes; then | ||
| 62 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], | ||
| 63 | + [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], | ||
| 64 | + [ | ||
| 65 | + AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` | ||
| 66 | + ], | ||
| 67 | + [ | ||
| 68 | + AS_TR_SH([ac_cv_sizeof_$1])=0 | ||
| 69 | + ]) | ||
| 70 | + else | ||
| 71 | + # The cast to unsigned long works around a bug in the HP C Compiler | ||
| 72 | + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects | ||
| 73 | + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. | ||
| 74 | + # This bug is HP SR number 8606223364. | ||
| 75 | + _AC_COMPUTE_INT([(long) (sizeof ($1))], | ||
| 76 | + [AS_TR_SH([ac_cv_sizeof_$1])], | ||
| 77 | + [AC_INCLUDES_DEFAULT([$3])], | ||
| 78 | + [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) | ||
| 79 | + fi | ||
| 80 | else | ||
| 81 | AS_TR_SH([ac_cv_sizeof_$1])=0 | ||
| 82 | -fi])dnl | ||
| 83 | +fi | ||
| 84 | +])dnl | ||
| 85 | AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), | ||
| 86 | [The size of a `$1', as computed by sizeof.]) | ||
| 87 | ])# AC_CHECK_SIZEOF | ||
diff --git a/meta/packages/autoconf/autoconf_2.61.bb b/meta/packages/autoconf/autoconf_2.61.bb deleted file mode 100644 index 3eb67d6729..0000000000 --- a/meta/packages/autoconf/autoconf_2.61.bb +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | require autoconf.inc | ||
| 2 | |||
| 3 | PR = "r1" | ||
| 4 | |||
| 5 | LICENSE = "GPLv2" | ||
| 6 | |||
| 7 | PARALLEL_MAKE = "" | ||
| 8 | |||
| 9 | DEPENDS += "m4-native" | ||
| 10 | RDEPENDS_${PN} = "m4 gnu-config" | ||
| 11 | |||
| 12 | SRC_URI += "file://autoreconf-include.patch;patch=1 \ | ||
| 13 | file://autoreconf-exclude.patch;patch=1 \ | ||
| 14 | file://autoreconf-foreign.patch;patch=1 \ | ||
| 15 | file://autoreconf-gnuconfigize.patch;patch=1 \ | ||
| 16 | file://autoheader-nonfatal-warnings.patch;patch=1 \ | ||
| 17 | file://config-site.patch;patch=1 \ | ||
| 18 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" | ||
| 19 | |||
| 20 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | ||
| 21 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" | ||
| 22 | |||
| 23 | SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" | ||
| 24 | |||
| 25 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/packages/autoconf/autoconf_2.65.bb b/meta/packages/autoconf/autoconf_2.65.bb index d3b2c37ae8..5adb9756d1 100644 --- a/meta/packages/autoconf/autoconf_2.65.bb +++ b/meta/packages/autoconf/autoconf_2.65.bb | |||
| @@ -15,8 +15,6 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \ | |||
| 15 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ | 15 | ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ |
| 16 | file://config_site.patch;patch=1" | 16 | file://config_site.patch;patch=1" |
| 17 | 17 | ||
| 18 | DEFAULT_PREFERENCE = "-1" | ||
| 19 | |||
| 20 | DEPENDS_virtclass-native = "m4-native gnu-config-native" | 18 | DEPENDS_virtclass-native = "m4-native gnu-config-native" |
| 21 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" | 19 | RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" |
| 22 | 20 | ||
diff --git a/meta/packages/automake/automake-native.inc b/meta/packages/automake/automake-native.inc deleted file mode 100644 index f9f357f9f6..0000000000 --- a/meta/packages/automake/automake-native.inc +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | require automake.inc | ||
| 2 | |||
| 3 | DEPENDS = "autoconf-native" | ||
| 4 | RDEPENDS_automake-native = "autoconf-native perl-native-runtime" | ||
| 5 | |||
| 6 | inherit native | ||
diff --git a/meta/packages/automake/automake-native_1.10.2.bb b/meta/packages/automake/automake-native_1.10.2.bb deleted file mode 100644 index 8fc754e82f..0000000000 --- a/meta/packages/automake/automake-native_1.10.2.bb +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | require automake-native.inc | ||
diff --git a/meta/packages/automake/automake_1.10.2.bb b/meta/packages/automake/automake_1.10.2.bb deleted file mode 100644 index 9ba5cb3685..0000000000 --- a/meta/packages/automake/automake_1.10.2.bb +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | require automake.inc | ||
| 2 | |||
| 3 | RDEPENDS_automake += "\ | ||
| 4 | autoconf \ | ||
| 5 | perl \ | ||
| 6 | perl-module-bytes \ | ||
| 7 | perl-module-constant \ | ||
| 8 | perl-module-cwd \ | ||
| 9 | perl-module-data-dumper \ | ||
| 10 | perl-module-dynaloader \ | ||
| 11 | perl-module-errno \ | ||
| 12 | perl-module-exporter-heavy \ | ||
| 13 | perl-module-file-basename \ | ||
| 14 | perl-module-file-compare \ | ||
| 15 | perl-module-file-copy \ | ||
| 16 | perl-module-file-glob \ | ||
| 17 | perl-module-file-spec-unix \ | ||
| 18 | perl-module-file-stat \ | ||
| 19 | perl-module-getopt-long \ | ||
| 20 | perl-module-io \ | ||
| 21 | perl-module-io-file \ | ||
| 22 | perl-module-posix \ | ||
| 23 | perl-module-strict \ | ||
| 24 | perl-module-text-parsewords \ | ||
| 25 | perl-module-vars " | ||
| 26 | |||
| 27 | SRC_URI += "file://path_prog_fixes.patch;patch=1" | ||
| 28 | |||
| 29 | NATIVE_INSTALL_WORKS = "1" | ||
| 30 | do_install () { | ||
| 31 | oe_runmake 'DESTDIR=${D}' install | ||
| 32 | install -d ${D}${datadir} | ||
| 33 | if [ ! -e ${D}${datadir}/aclocal ]; then | ||
| 34 | ln -sf aclocal-1.10 ${D}${datadir}/aclocal | ||
| 35 | fi | ||
| 36 | if [ ! -e ${D}${datadir}/automake ]; then | ||
| 37 | ln -sf automake-1.10 ${D}${datadir}/automake | ||
| 38 | fi | ||
| 39 | } | ||
diff --git a/meta/packages/automake/automake_1.11.1.bb b/meta/packages/automake/automake_1.11.1.bb index 0e75418181..067898a44f 100644 --- a/meta/packages/automake/automake_1.11.1.bb +++ b/meta/packages/automake/automake_1.11.1.bb | |||
| @@ -37,14 +37,6 @@ NATIVE_INSTALL_WORKS = "1" | |||
| 37 | do_install () { | 37 | do_install () { |
| 38 | oe_runmake 'DESTDIR=${D}' install | 38 | oe_runmake 'DESTDIR=${D}' install |
| 39 | install -d ${D}${datadir} | 39 | install -d ${D}${datadir} |
| 40 | if [ ! -e ${D}${datadir}/aclocal ]; then | ||
| 41 | ln -sf aclocal-1.10 ${D}${datadir}/aclocal | ||
| 42 | fi | ||
| 43 | if [ ! -e ${D}${datadir}/automake ]; then | ||
| 44 | ln -sf automake-1.10 ${D}${datadir}/automake | ||
| 45 | fi | ||
| 46 | } | 40 | } |
| 47 | 41 | ||
| 48 | BBCLASSEXTEND = "native" | 42 | BBCLASSEXTEND = "native" |
| 49 | |||
| 50 | DEFAULT_PREFERENCE = "-1" | ||
