| 1 |
vapier 10/02/08 23:20:57 |
| 2 |
|
| 3 |
Modified: 0001-add-uClibc-guess-support.patch |
| 4 |
0002-add-ps2-targets-to-config.sub.patch |
| 5 |
Removed: disable-broken-tests.patch |
| 6 |
Log: |
| 7 |
update patches to latest git |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: 0001-add-uClibc-guess-support.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- 0001-add-uClibc-guess-support.patch 5 Sep 2009 00:28:27 -0000 1.2 |
| 23 |
+++ 0001-add-uClibc-guess-support.patch 8 Feb 2010 23:20:56 -0000 1.3 |
| 24 |
@@ -1,24 +1,24 @@ |
| 25 |
-From d5a10be0ad318f44d81c147033359e487e918ffd Mon Sep 17 00:00:00 2001 |
| 26 |
+From 8498f76fe6131577ce3e90af58a6be958b3795be Mon Sep 17 00:00:00 2001 |
| 27 |
From: Mike Frysinger <vapier@g.o> |
| 28 |
Date: Thu, 9 Oct 2008 15:51:09 -0400 |
| 29 |
Subject: [PATCH 1/2] add uClibc guess support |
| 30 |
|
| 31 |
--- |
| 32 |
- config.guess | 77 +++++++++++++++++++++++++++++++++++++--------------------- |
| 33 |
- 1 files changed, 49 insertions(+), 28 deletions(-) |
| 34 |
+ config.guess | 89 ++++++++++++++++++++++++++++++++++------------------------ |
| 35 |
+ 1 files changed, 52 insertions(+), 37 deletions(-) |
| 36 |
|
| 37 |
diff --git a/config.guess b/config.guess |
| 38 |
-index bb0b03e..12734a7 100755 |
| 39 |
+index c2246a4..bf48496 100755 |
| 40 |
--- a/config.guess |
| 41 |
+++ b/config.guess |
| 42 |
-@@ -139,6 +139,25 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
| 43 |
+@@ -140,6 +140,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
| 44 |
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
| 45 |
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
| 46 |
|
| 47 |
+case "${UNAME_SYSTEM}" in |
| 48 |
+Linux|GNU/*) |
| 49 |
+ eval $set_cc_for_build |
| 50 |
-+ cat << EOF > $dummy.c |
| 51 |
++ cat <<-EOF > $dummy.c |
| 52 |
+ #include <features.h> |
| 53 |
+ #ifdef __UCLIBC__ |
| 54 |
+ # ifdef __UCLIBC_CONFIG_VERSION__ |
| 55 |
@@ -27,17 +27,26 @@ |
| 56 |
+ LIBC=uclibc |
| 57 |
+ # endif |
| 58 |
+ #else |
| 59 |
++ # ifdef __dietlibc__ |
| 60 |
++ LIBC=dietlibc |
| 61 |
++ # else |
| 62 |
+ LIBC=gnu |
| 63 |
++ # endif |
| 64 |
+ #endif |
| 65 |
-+EOF |
| 66 |
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` |
| 67 |
++ EOF |
| 68 |
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
| 69 |
+ ;; |
| 70 |
+esac |
| 71 |
+ |
| 72 |
# Note: order is significant - the case branches are not exclusive. |
| 73 |
|
| 74 |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
| 75 |
-@@ -849,7 +868,7 @@ EOF |
| 76 |
+@@ -849,11 +872,11 @@ EOF |
| 77 |
+ exit ;; |
| 78 |
+ *:GNU:*:*) |
| 79 |
+ # the GNU system |
| 80 |
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
| 81 |
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
| 82 |
exit ;; |
| 83 |
*:GNU/*:*:*) |
| 84 |
# other systems with GNU libc and userland |
| 85 |
@@ -46,7 +55,17 @@ |
| 86 |
exit ;; |
| 87 |
i*86:Minix:*:*) |
| 88 |
echo ${UNAME_MACHINE}-pc-minix |
| 89 |
-@@ -859,31 +878,31 @@ EOF |
| 90 |
+@@ -869,50 +892,42 @@ EOF |
| 91 |
+ EV68*) UNAME_MACHINE=alphaev68 ;; |
| 92 |
+ esac |
| 93 |
+ objdump --private-headers /bin/sh | grep -q ld.so.1 |
| 94 |
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
| 95 |
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
| 96 |
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
| 97 |
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 98 |
+ exit ;; |
| 99 |
+ arm*:Linux:*:*) |
| 100 |
+ eval $set_cc_for_build |
| 101 |
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
| 102 |
| grep -q __ARM_EABI__ |
| 103 |
then |
| 104 |
@@ -73,6 +92,18 @@ |
| 105 |
- echo frv-unknown-linux-gnu |
| 106 |
+ echo frv-unknown-linux-${LIBC} |
| 107 |
exit ;; |
| 108 |
+ i*86:Linux:*:*) |
| 109 |
+- LIBC=gnu |
| 110 |
+- eval $set_cc_for_build |
| 111 |
+- sed 's/^ //' << EOF >$dummy.c |
| 112 |
+- #ifdef __dietlibc__ |
| 113 |
+- LIBC=dietlibc |
| 114 |
+- #endif |
| 115 |
+-EOF |
| 116 |
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
| 117 |
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
| 118 |
++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
| 119 |
+ exit ;; |
| 120 |
ia64:Linux:*:*) |
| 121 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 122 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 123 |
@@ -87,10 +118,10 @@ |
| 124 |
exit ;; |
| 125 |
mips:Linux:*:* | mips64:Linux:*:*) |
| 126 |
eval $set_cc_for_build |
| 127 |
-@@ -906,16 +925,16 @@ EOF |
| 128 |
- s: ::g |
| 129 |
- p |
| 130 |
- }'`" |
| 131 |
+@@ -931,51 +946,51 @@ EOF |
| 132 |
+ #endif |
| 133 |
+ EOF |
| 134 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
| 135 |
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
| 136 |
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
| 137 |
;; |
| 138 |
@@ -98,29 +129,14 @@ |
| 139 |
- echo or32-unknown-linux-gnu |
| 140 |
+ echo or32-unknown-linux-${LIBC} |
| 141 |
exit ;; |
| 142 |
- ppc:Linux:*:*) |
| 143 |
-- echo powerpc-unknown-linux-gnu |
| 144 |
-+ echo powerpc-unknown-linux-${LIBC} |
| 145 |
- exit ;; |
| 146 |
- ppc64:Linux:*:*) |
| 147 |
-- echo powerpc64-unknown-linux-gnu |
| 148 |
-+ echo powerpc64-unknown-linux-${LIBC} |
| 149 |
- exit ;; |
| 150 |
- alpha:Linux:*:*) |
| 151 |
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
| 152 |
-@@ -928,43 +947,43 @@ EOF |
| 153 |
- EV68*) UNAME_MACHINE=alphaev68 ;; |
| 154 |
- esac |
| 155 |
- objdump --private-headers /bin/sh | grep -q ld.so.1 |
| 156 |
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
| 157 |
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
| 158 |
-+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi |
| 159 |
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 160 |
- exit ;; |
| 161 |
padre:Linux:*:*) |
| 162 |
- echo sparc-unknown-linux-gnu |
| 163 |
+ echo sparc-unknown-linux-${LIBC} |
| 164 |
exit ;; |
| 165 |
+ parisc64:Linux:*:* | hppa64:Linux:*:*) |
| 166 |
+- echo hppa64-unknown-linux-gnu |
| 167 |
++ echo hppa64-unknown-linux-${LIBC} |
| 168 |
+ exit ;; |
| 169 |
parisc:Linux:*:* | hppa:Linux:*:*) |
| 170 |
# Look for CPU level |
| 171 |
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
| 172 |
@@ -132,9 +148,13 @@ |
| 173 |
+ *) echo hppa-unknown-linux-${LIBC} ;; |
| 174 |
esac |
| 175 |
exit ;; |
| 176 |
- parisc64:Linux:*:* | hppa64:Linux:*:*) |
| 177 |
-- echo hppa64-unknown-linux-gnu |
| 178 |
-+ echo hppa64-unknown-linux-${LIBC} |
| 179 |
+ ppc64:Linux:*:*) |
| 180 |
+- echo powerpc64-unknown-linux-gnu |
| 181 |
++ echo powerpc64-unknown-linux-${LIBC} |
| 182 |
+ exit ;; |
| 183 |
+ ppc:Linux:*:*) |
| 184 |
+- echo powerpc-unknown-linux-gnu |
| 185 |
++ echo powerpc-unknown-linux-${LIBC} |
| 186 |
exit ;; |
| 187 |
s390:Linux:*:* | s390x:Linux:*:*) |
| 188 |
echo ${UNAME_MACHINE}-ibm-linux |
| 189 |
@@ -163,21 +183,8 @@ |
| 190 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 191 |
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
| 192 |
exit ;; |
| 193 |
- i*86:Linux:*:*) |
| 194 |
- # The BFD linker knows what the default object file format is, so |
| 195 |
-@@ -979,9 +998,11 @@ EOF |
| 196 |
- p'` |
| 197 |
- case "$ld_supported_targets" in |
| 198 |
- elf32-i386) |
| 199 |
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
| 200 |
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" |
| 201 |
- ;; |
| 202 |
- esac |
| 203 |
-+ # This should get integrated into the C code below, but now we hack |
| 204 |
-+ if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi |
| 205 |
- # Determine whether the default compiler is a.out or elf |
| 206 |
- eval $set_cc_for_build |
| 207 |
- sed 's/^ //' << EOF >$dummy.c |
| 208 |
+ i*86:DYNIX/ptx:4*:*) |
| 209 |
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
| 210 |
-- |
| 211 |
-1.6.4 |
| 212 |
+1.6.6.1 |
| 213 |
|
| 214 |
|
| 215 |
|
| 216 |
|
| 217 |
1.3 sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch |
| 218 |
|
| 219 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?rev=1.3&view=markup |
| 220 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?rev=1.3&content-type=text/plain |
| 221 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch?r1=1.2&r2=1.3 |
| 222 |
|
| 223 |
Index: 0002-add-ps2-targets-to-config.sub.patch |
| 224 |
=================================================================== |
| 225 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch,v |
| 226 |
retrieving revision 1.2 |
| 227 |
retrieving revision 1.3 |
| 228 |
diff -u -r1.2 -r1.3 |
| 229 |
--- 0002-add-ps2-targets-to-config.sub.patch 5 Sep 2009 00:28:27 -0000 1.2 |
| 230 |
+++ 0002-add-ps2-targets-to-config.sub.patch 8 Feb 2010 23:20:56 -0000 1.3 |
| 231 |
@@ -1,4 +1,4 @@ |
| 232 |
-From 96cb2b8095c7ac9d211f0abc6704b769344a8afa Mon Sep 17 00:00:00 2001 |
| 233 |
+From 8550922eda8dc401a3059c1e9eb2d70a359cb8a9 Mon Sep 17 00:00:00 2001 |
| 234 |
From: Mike Frysinger <vapier@g.o> |
| 235 |
Date: Thu, 9 Oct 2008 15:51:35 -0400 |
| 236 |
Subject: [PATCH 2/2] add ps2 targets to config.sub |
| 237 |
@@ -8,10 +8,10 @@ |
| 238 |
1 files changed, 20 insertions(+), 2 deletions(-) |
| 239 |
|
| 240 |
diff --git a/config.sub b/config.sub |
| 241 |
-index 8ca084b..3243784 100755 |
| 242 |
+index c2d1257..4c0d959 100755 |
| 243 |
--- a/config.sub |
| 244 |
+++ b/config.sub |
| 245 |
-@@ -251,7 +251,7 @@ case $basic_machine in |
| 246 |
+@@ -252,7 +252,7 @@ case $basic_machine in |
| 247 |
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
| 248 |
| bfin \ |
| 249 |
| c4x | clipper \ |
| 250 |
@@ -20,7 +20,7 @@ |
| 251 |
| fido | fr30 | frv \ |
| 252 |
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
| 253 |
| i370 | i860 | i960 | ia64 \ |
| 254 |
-@@ -747,6 +747,24 @@ case $basic_machine in |
| 255 |
+@@ -752,6 +752,24 @@ case $basic_machine in |
| 256 |
basic_machine=m68k-atari |
| 257 |
os=-mint |
| 258 |
;; |
| 259 |
@@ -45,15 +45,15 @@ |
| 260 |
mips3*-*) |
| 261 |
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
| 262 |
;; |
| 263 |
-@@ -1296,7 +1314,7 @@ case $os in |
| 264 |
+@@ -1305,7 +1323,7 @@ case $os in |
| 265 |
+ | -uxpv* | -beos* | -mpeix* | -udk* \ |
| 266 |
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
| 267 |
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
| 268 |
+- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
| 269 |
++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ |
| 270 |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| 271 |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
| 272 |
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
| 273 |
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
| 274 |
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) |
| 275 |
- # Remember, each alternative MUST END IN *, to match a version number. |
| 276 |
- ;; |
| 277 |
- -qnx*) |
| 278 |
-- |
| 279 |
-1.6.4 |
| 280 |
+1.6.6.1 |
Archives