| 1 |
vapier 08/01/02 01:01:04 |
| 2 |
|
| 3 |
Modified: toolchain-funcs.eclass |
| 4 |
Log: |
| 5 |
handle linux-2.6.24+ where {i386,x86_64}=>{x86} |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.75 eclass/toolchain-funcs.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.75&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.75&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.74&r2=1.75 |
| 13 |
|
| 14 |
Index: toolchain-funcs.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v |
| 17 |
retrieving revision 1.74 |
| 18 |
retrieving revision 1.75 |
| 19 |
diff -u -r1.74 -r1.75 |
| 20 |
--- toolchain-funcs.eclass 17 Aug 2007 10:14:13 -0000 1.74 |
| 21 |
+++ toolchain-funcs.eclass 2 Jan 2008 01:01:03 -0000 1.75 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.74 2007/08/17 10:14:13 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.75 2008/01/02 01:01:03 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: toolchain-funcs.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -170,7 +170,15 @@ |
| 31 |
bfin*) ninj blackfin bfin;; |
| 32 |
cris*) echo cris;; |
| 33 |
hppa*) ninj parisc hppa;; |
| 34 |
- i?86*) ninj i386 x86;; |
| 35 |
+ i?86*) |
| 36 |
+ # Starting with linux-2.6.24, the 'x86_64' and 'i386' |
| 37 |
+ # trees have been unified into 'x86'. |
| 38 |
+ if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) ]] ; then |
| 39 |
+ echo i386 |
| 40 |
+ else |
| 41 |
+ echo x86 |
| 42 |
+ fi |
| 43 |
+ ;; |
| 44 |
ia64*) echo ia64;; |
| 45 |
m68*) echo m68k;; |
| 46 |
mips*) echo mips;; |
| 47 |
@@ -205,7 +213,15 @@ |
| 48 |
|| echo sparc |
| 49 |
;; |
| 50 |
vax*) echo vax;; |
| 51 |
- x86_64*) ninj x86_64 amd64;; |
| 52 |
+ x86_64*) |
| 53 |
+ # Starting with linux-2.6.24, the 'x86_64' and 'i386' |
| 54 |
+ # trees have been unified into 'x86'. |
| 55 |
+ if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] ; then |
| 56 |
+ echo x86 |
| 57 |
+ else |
| 58 |
+ ninj x86_64 amd64 |
| 59 |
+ fi |
| 60 |
+ ;; |
| 61 |
|
| 62 |
# since our usage of tc-arch is largely concerned with |
| 63 |
# normalizing inputs for testing ${CTARGET}, let's filter |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
-- |
| 68 |
gentoo-commits@g.o mailing list |
Archives