/[gentoo-x86]/eclass/multilib.eclass
Gentoo

Diff of /eclass/multilib.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.54 Revision 1.56
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 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.54 2006/07/12 07:40:49 kevquinn Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.56 2006/10/13 16:49:39 blubb Exp $
4# 4#
5# Author: Jeremy Huddleston <eradicator@gentoo.org> 5# Author: Jeremy Huddleston <eradicator@gentoo.org>
6# 6#
7# This eclass is for all functions pertaining to handling multilib. 7# This eclass is for all functions pertaining to handling multilib.
8# configurations. 8# configurations.
268get_all_libdirs() { 268get_all_libdirs() {
269 local libdirs="lib" 269 local libdirs="lib"
270 local abi 270 local abi
271 local dir 271 local dir
272 272
273 # Remove when amd64's 2004.3 is purged.
274 if [[ -n "${CONF_LIBDIR}" ]]; then
275 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
276 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
277 done
278 else
279 for abi in ${MULTILIB_ABIS}; do 273 for abi in ${MULTILIB_ABIS}; do
280 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 274 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
281 done 275 done
282 fi
283 276
284 echo "${libdirs}" 277 echo "${libdirs}"
285} 278}
286 279
287# Return true if ${ABI} is the last ABI on our list (or if we're not 280# Return true if ${ABI} is the last ABI on our list (or if we're not
658} 651}
659 652
660# Hide multilib details here for packages which are forced to be compiled for a 653# Hide multilib details here for packages which are forced to be compiled for a
661# specific ABI when run on another ABI (like x86-specific packages on amd64) 654# specific ABI when run on another ABI (like x86-specific packages on amd64)
662multilib_toolchain_setup() { 655multilib_toolchain_setup() {
656 export ABI=$1
657
663 if has_version app-admin/eselect-compiler ; then 658 if has_version app-admin/eselect-compiler ; then
664 # Binutils doesn't have wrappers for ld and as (yet). Eventually it 659 # Binutils doesn't have wrappers for ld and as (yet). Eventually it
665 # will, and all this can just be handled with CHOST. 660 # will, and all this can just be handled with CHOST.
666 export LD="ld $(get_abi_LDFLAGS $1)" 661 export LD="ld $(get_abi_LDFLAGS $1)"
667 export AS="as $(get_abi_ASFLAGS $1)" 662 export AS="as $(get_abi_ASFLAGS $1)"
668 663
669 export CHOST=$(get_abi_CHOST $1) 664 export CHOST=$(get_abi_CHOST $1)
670 export CBUILD=$(get_abi_CHOST $1) 665 export CBUILD=$(get_abi_CHOST $1)
671 else 666 else
672 tc-export CC 667 tc-export CC
673 export ABI=$1
674 fi 668 fi
675} 669}

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.56

  ViewVC Help
Powered by ViewVC 1.1.20