| 1 |
vapier 09/09/05 00:28:28 |
| 2 |
|
| 3 |
Modified: 0002-add-ps2-targets-to-config.sub.patch |
| 4 |
0001-add-uClibc-guess-support.patch |
| 5 |
Added: disable-broken-tests.patch |
| 6 |
Log: |
| 7 |
Version bump. |
| 8 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: 0002-add-ps2-targets-to-config.sub.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- 0002-add-ps2-targets-to-config.sub.patch 9 Oct 2008 19:55:00 -0000 1.1 |
| 24 |
+++ 0002-add-ps2-targets-to-config.sub.patch 5 Sep 2009 00:28:27 -0000 1.2 |
| 25 |
@@ -1,17 +1,17 @@ |
| 26 |
-From 52054bdf40780dcc9ae252f544a9152c3a32a691 Mon Sep 17 00:00:00 2001 |
| 27 |
+From 96cb2b8095c7ac9d211f0abc6704b769344a8afa Mon Sep 17 00:00:00 2001 |
| 28 |
From: Mike Frysinger <vapier@g.o> |
| 29 |
Date: Thu, 9 Oct 2008 15:51:35 -0400 |
| 30 |
-Subject: [PATCH] add ps2 targets to config.sub |
| 31 |
+Subject: [PATCH 2/2] add ps2 targets to config.sub |
| 32 |
|
| 33 |
--- |
| 34 |
config.sub | 22 ++++++++++++++++++++-- |
| 35 |
1 files changed, 20 insertions(+), 2 deletions(-) |
| 36 |
|
| 37 |
diff --git a/config.sub b/config.sub |
| 38 |
-index 053e738..a31b87d 100755 |
| 39 |
+index 8ca084b..3243784 100755 |
| 40 |
--- a/config.sub |
| 41 |
+++ b/config.sub |
| 42 |
-@@ -244,7 +244,7 @@ case $basic_machine in |
| 43 |
+@@ -251,7 +251,7 @@ case $basic_machine in |
| 44 |
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
| 45 |
| bfin \ |
| 46 |
| c4x | clipper \ |
| 47 |
@@ -20,7 +20,7 @@ |
| 48 |
| fido | fr30 | frv \ |
| 49 |
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
| 50 |
| i370 | i860 | i960 | ia64 \ |
| 51 |
-@@ -726,6 +726,24 @@ case $basic_machine in |
| 52 |
+@@ -747,6 +747,24 @@ case $basic_machine in |
| 53 |
basic_machine=m68k-atari |
| 54 |
os=-mint |
| 55 |
;; |
| 56 |
@@ -45,7 +45,7 @@ |
| 57 |
mips3*-*) |
| 58 |
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
| 59 |
;; |
| 60 |
-@@ -1274,7 +1292,7 @@ case $os in |
| 61 |
+@@ -1296,7 +1314,7 @@ case $os in |
| 62 |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| 63 |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
| 64 |
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
| 65 |
@@ -55,5 +55,5 @@ |
| 66 |
;; |
| 67 |
-qnx*) |
| 68 |
-- |
| 69 |
-1.6.0.1 |
| 70 |
+1.6.4 |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.2 sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?rev=1.2&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?rev=1.2&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?r1=1.1&r2=1.2 |
| 80 |
|
| 81 |
Index: 0001-add-uClibc-guess-support.patch |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch,v |
| 84 |
retrieving revision 1.1 |
| 85 |
retrieving revision 1.2 |
| 86 |
diff -u -r1.1 -r1.2 |
| 87 |
--- 0001-add-uClibc-guess-support.patch 9 Oct 2008 19:55:00 -0000 1.1 |
| 88 |
+++ 0001-add-uClibc-guess-support.patch 5 Sep 2009 00:28:27 -0000 1.2 |
| 89 |
@@ -1,21 +1,22 @@ |
| 90 |
-From eeb92c3a61926ee07325efb48f1d72bad0e9c751 Mon Sep 17 00:00:00 2001 |
| 91 |
+From d5a10be0ad318f44d81c147033359e487e918ffd Mon Sep 17 00:00:00 2001 |
| 92 |
From: Mike Frysinger <vapier@g.o> |
| 93 |
Date: Thu, 9 Oct 2008 15:51:09 -0400 |
| 94 |
-Subject: [PATCH] add uClibc guess support |
| 95 |
+Subject: [PATCH 1/2] add uClibc guess support |
| 96 |
|
| 97 |
--- |
| 98 |
- config.guess | 77 ++++++++++++++++++++++++++++++++++++---------------------- |
| 99 |
- 1 files changed, 48 insertions(+), 29 deletions(-) |
| 100 |
+ config.guess | 77 +++++++++++++++++++++++++++++++++++++--------------------- |
| 101 |
+ 1 files changed, 49 insertions(+), 28 deletions(-) |
| 102 |
|
| 103 |
diff --git a/config.guess b/config.guess |
| 104 |
-index f0f0d36..202f698 100755 |
| 105 |
+index bb0b03e..12734a7 100755 |
| 106 |
--- a/config.guess |
| 107 |
+++ b/config.guess |
| 108 |
-@@ -139,6 +139,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
| 109 |
+@@ -139,6 +139,25 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
| 110 |
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
| 111 |
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
| 112 |
|
| 113 |
-+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then |
| 114 |
++case "${UNAME_SYSTEM}" in |
| 115 |
++Linux|GNU/*) |
| 116 |
+ eval $set_cc_for_build |
| 117 |
+ cat << EOF > $dummy.c |
| 118 |
+ #include <features.h> |
| 119 |
@@ -30,12 +31,22 @@ |
| 120 |
+ #endif |
| 121 |
+EOF |
| 122 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` |
| 123 |
-+fi |
| 124 |
++ ;; |
| 125 |
++esac |
| 126 |
+ |
| 127 |
# Note: order is significant - the case branches are not exclusive. |
| 128 |
|
| 129 |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
| 130 |
-@@ -840,31 +857,31 @@ EOF |
| 131 |
+@@ -849,7 +868,7 @@ EOF |
| 132 |
+ exit ;; |
| 133 |
+ *:GNU/*:*:*) |
| 134 |
+ # other systems with GNU libc and userland |
| 135 |
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
| 136 |
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
| 137 |
+ exit ;; |
| 138 |
+ i*86:Minix:*:*) |
| 139 |
+ echo ${UNAME_MACHINE}-pc-minix |
| 140 |
+@@ -859,31 +878,31 @@ EOF |
| 141 |
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
| 142 |
| grep -q __ARM_EABI__ |
| 143 |
then |
| 144 |
@@ -74,18 +85,9 @@ |
| 145 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 146 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 147 |
exit ;; |
| 148 |
- mips:Linux:*:*) |
| 149 |
+ mips:Linux:*:* | mips64:Linux:*:*) |
| 150 |
eval $set_cc_for_build |
| 151 |
-@@ -887,7 +904,7 @@ EOF |
| 152 |
- s: ::g |
| 153 |
- p |
| 154 |
- }'`" |
| 155 |
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
| 156 |
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
| 157 |
- ;; |
| 158 |
- mips64:Linux:*:*) |
| 159 |
- eval $set_cc_for_build |
| 160 |
-@@ -910,16 +927,16 @@ EOF |
| 161 |
+@@ -906,16 +925,16 @@ EOF |
| 162 |
s: ::g |
| 163 |
p |
| 164 |
}'`" |
| 165 |
@@ -106,18 +108,19 @@ |
| 166 |
exit ;; |
| 167 |
alpha:Linux:*:*) |
| 168 |
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
| 169 |
-@@ -932,8 +949,8 @@ EOF |
| 170 |
+@@ -928,43 +947,43 @@ EOF |
| 171 |
EV68*) UNAME_MACHINE=alphaev68 ;; |
| 172 |
esac |
| 173 |
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
| 174 |
+ objdump --private-headers /bin/sh | grep -q ld.so.1 |
| 175 |
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
| 176 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
| 177 |
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
| 178 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 179 |
exit ;; |
| 180 |
padre:Linux:*:*) |
| 181 |
- echo sparc-unknown-linux-gnu |
| 182 |
-@@ -941,34 +958,34 @@ EOF |
| 183 |
+- echo sparc-unknown-linux-gnu |
| 184 |
++ echo sparc-unknown-linux-${LIBC} |
| 185 |
+ exit ;; |
| 186 |
parisc:Linux:*:* | hppa:Linux:*:*) |
| 187 |
# Look for CPU level |
| 188 |
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
| 189 |
@@ -162,23 +165,13 @@ |
| 190 |
exit ;; |
| 191 |
i*86:Linux:*:*) |
| 192 |
# The BFD linker knows what the default object file format is, so |
| 193 |
-@@ -983,17 +1000,19 @@ EOF |
| 194 |
+@@ -979,9 +998,11 @@ EOF |
| 195 |
p'` |
| 196 |
case "$ld_supported_targets" in |
| 197 |
elf32-i386) |
| 198 |
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
| 199 |
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" |
| 200 |
;; |
| 201 |
- a.out-i386-linux) |
| 202 |
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout" |
| 203 |
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" |
| 204 |
- exit ;; |
| 205 |
- "") |
| 206 |
- # Either a pre-BFD a.out linker (linux-gnuoldld) or |
| 207 |
- # one that does not give us useful --help. |
| 208 |
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" |
| 209 |
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" |
| 210 |
- exit ;; |
| 211 |
esac |
| 212 |
+ # This should get integrated into the C code below, but now we hack |
| 213 |
+ if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi |
| 214 |
@@ -186,5 +179,5 @@ |
| 215 |
eval $set_cc_for_build |
| 216 |
sed 's/^ //' << EOF >$dummy.c |
| 217 |
-- |
| 218 |
-1.6.0.1 |
| 219 |
+1.6.4 |
| 220 |
|
| 221 |
|
| 222 |
|
| 223 |
|
| 224 |
1.1 sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch |
| 225 |
|
| 226 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch?rev=1.1&view=markup |
| 227 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/disable-broken-tests.patch?rev=1.1&content-type=text/plain |
| 228 |
|
| 229 |
Index: disable-broken-tests.patch |
| 230 |
=================================================================== |
| 231 |
the test relies on `uname -m`, so it'll fail on non-i386 systems |
| 232 |
|
| 233 |
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data |
| 234 |
index 7f6f214..189b067 100644 |
| 235 |
--- a/testsuite/config-guess.data |
| 236 |
+++ b/testsuite/config-guess.data |
| 237 |
@@ -32,8 +32,6 @@ xtensa 2.6.15 Linux ignored xtensa-unknown-linux-gnu |
| 238 |
x86_64 1.0 MINGW ignored x86_64-pc-mingw32 |
| 239 |
i386 1.0 MINGW ignored i386-pc-mingw32 |
| 240 |
SX-8R 1.0 SUPER-UX ignored sx8r-nec-superux1.0 |
| 241 |
-i86xen 5.6 SunOS ignored i386-pc-solaris2.6 |
| 242 |
-i86pc 5.6 SunOS ignored i386-pc-solaris2.6 |
| 243 |
IA64 6.0 Interix ignored ia64-unknown-interix6.0 |
| 244 |
BePC 1.0 Haiku ignored i586-pc-haiku |
| 245 |
padre 2.6.15 Linux ignored sparc-unknown-linux-gnu |
Archives