| 1 |
vapier 12/08/22 16:03:08 |
| 2 |
|
| 3 |
Modified: multilib.eclass |
| 4 |
Log: |
| 5 |
handle new x32 chost |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.99 eclass/multilib.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.99&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.99&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.98&r2=1.99 |
| 13 |
|
| 14 |
Index: multilib.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v |
| 17 |
retrieving revision 1.98 |
| 18 |
retrieving revision 1.99 |
| 19 |
diff -u -r1.98 -r1.99 |
| 20 |
--- multilib.eclass 3 Jun 2012 08:27:53 -0000 1.98 |
| 21 |
+++ multilib.eclass 22 Aug 2012 16:03:08 -0000 1.99 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.98 2012/06/03 08:27:53 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.99 2012/08/22 16:03:08 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: multilib.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -287,6 +287,7 @@ |
| 31 |
x86_64*) |
| 32 |
export CFLAGS_x86=${CFLAGS_x86--m32} |
| 33 |
export CHOST_x86=${CTARGET/x86_64/i686} |
| 34 |
+ CHOST_x86=${CHOST_x86/%-gnux32/-gnu} |
| 35 |
export CTARGET_x86=${CHOST_x86} |
| 36 |
if [[ ${SYMLINK_LIB} == "yes" ]] ; then |
| 37 |
export LIBDIR_x86="lib32" |
| 38 |
@@ -295,17 +296,25 @@ |
| 39 |
fi |
| 40 |
|
| 41 |
export CFLAGS_amd64=${CFLAGS_amd64--m64} |
| 42 |
- export CHOST_amd64=${CTARGET} |
| 43 |
+ export CHOST_amd64=${CTARGET/%-gnux32/-gnu} |
| 44 |
export CTARGET_amd64=${CHOST_amd64} |
| 45 |
export LIBDIR_amd64="lib64" |
| 46 |
|
| 47 |
export CFLAGS_x32=${CFLAGS_x32--mx32} |
| 48 |
- export CHOST_x32=${CTARGET} |
| 49 |
+ export CHOST_x32=${CTARGET/%-gnu/-gnux32} |
| 50 |
export CTARGET_x32=${CHOST_x32} |
| 51 |
export LIBDIR_x32="libx32" |
| 52 |
|
| 53 |
- : ${MULTILIB_ABIS=amd64 x86} |
| 54 |
- : ${DEFAULT_ABI=amd64} |
| 55 |
+ case ${CTARGET} in |
| 56 |
+ *-gnux32) |
| 57 |
+ : ${MULTILIB_ABIS=x32 amd64 x86} |
| 58 |
+ : ${DEFAULT_ABI=x32} |
| 59 |
+ ;; |
| 60 |
+ *) |
| 61 |
+ : ${MULTILIB_ABIS=amd64 x86} |
| 62 |
+ : ${DEFAULT_ABI=amd64} |
| 63 |
+ ;; |
| 64 |
+ esac |
| 65 |
;; |
| 66 |
mips64*) |
| 67 |
export CFLAGS_o32=${CFLAGS_o32--mabi=32} |
Archives