| 1 | # Copyright 1999-2011 Gentoo Foundation |
1 | # Copyright 1999-2011 Gentoo Foundation |
| 2 | # Distributed under the terms of the GNU General Public License v2 |
2 | # Distributed under the terms of the GNU General Public License v2 |
| 3 | # $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.86 2011/03/18 19:12:08 vapier Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.89 2011/03/18 21:58:15 vapier Exp $ |
| 4 | |
4 | |
| 5 | # @ECLASS: multilib.eclass |
5 | # @ECLASS: multilib.eclass |
| 6 | # @MAINTAINER: |
6 | # @MAINTAINER: |
| 7 | # amd64@gentoo.org |
7 | # amd64@gentoo.org |
| 8 | # toolchain@gentoo.org |
8 | # toolchain@gentoo.org |
| … | |
… | |
| 180 | fi |
180 | fi |
| 181 | |
181 | |
| 182 | if [[ ${EMULTILIB_PKG} == "true" ]] ; then |
182 | if [[ ${EMULTILIB_PKG} == "true" ]] ; then |
| 183 | for x in ${MULTILIB_ABIS} ; do |
183 | for x in ${MULTILIB_ABIS} ; do |
| 184 | if [[ ${x} != "${DEFAULT_ABI}" ]] ; then |
184 | if [[ ${x} != "${DEFAULT_ABI}" ]] ; then |
| 185 | hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" |
185 | hasq ${x} ${ABI_DENY} || order="${order} ${x}" |
| 186 | fi |
186 | fi |
| 187 | done |
187 | done |
| 188 | hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" |
188 | hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}" |
| 189 | |
189 | |
| 190 | if [[ -n ${ABI_ALLOW} ]] ; then |
190 | if [[ -n ${ABI_ALLOW} ]] ; then |
| 191 | local ordera="" |
191 | local ordera="" |
| 192 | for x in ${order} ; do |
192 | for x in ${order} ; do |
| 193 | if hasq ${x} ${ABI_ALLOW} ; then |
193 | if hasq ${x} ${ABI_ALLOW} ; then |
| … | |
… | |
| 263 | |
263 | |
| 264 | # @FUNCTION: number_abis |
264 | # @FUNCTION: number_abis |
| 265 | # @DESCRIPTION: |
265 | # @DESCRIPTION: |
| 266 | # echo the number of ABIs we will be installing for |
266 | # echo the number of ABIs we will be installing for |
| 267 | number_abis() { |
267 | number_abis() { |
| 268 | get_install_abis | wc -w |
268 | set -- `get_install_abis` |
|
|
269 | echo $# |
| 269 | } |
270 | } |
| 270 | |
271 | |
| 271 | # @FUNCTION: get_ml_incdir |
272 | # @FUNCTION: get_ml_incdir |
| 272 | # @USAGE: [include_dir] [ABI] |
273 | # @USAGE: [include_dir] [ABI] |
| 273 | # @DESCRIPTION: |
274 | # @DESCRIPTION: |
| … | |
… | |
| 580 | x86_64*) |
581 | x86_64*) |
| 581 | export CFLAGS_x86=${CFLAGS_x86--m32} |
582 | export CFLAGS_x86=${CFLAGS_x86--m32} |
| 582 | export CHOST_x86=${CTARGET/x86_64/i686} |
583 | export CHOST_x86=${CTARGET/x86_64/i686} |
| 583 | export CTARGET_x86=${CHOST_x86} |
584 | export CTARGET_x86=${CHOST_x86} |
| 584 | export CDEFINE_x86="__i386__" |
585 | export CDEFINE_x86="__i386__" |
| 585 | if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then |
586 | if [[ ${SYMLINK_LIB} == "yes" ]] ; then |
| 586 | export LIBDIR_x86="lib32" |
587 | export LIBDIR_x86="lib32" |
| 587 | else |
588 | else |
| 588 | export LIBDIR_x86="lib" |
589 | export LIBDIR_x86="lib" |
| 589 | fi |
590 | fi |
| 590 | |
591 | |