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

Diff of /eclass/multilib.eclass

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

Revision 1.36 Revision 1.47
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.36 2005/10/07 01:22:36 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.47 2006/01/07 04:40:45 eradicator 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.
94### END DOCUMENTATION ### 94### END DOCUMENTATION ###
95 95
96# Defaults: 96# Defaults:
97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
98export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 98export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
99# This causes econf to set --libdir=/usr/lib where it didn't before
100#export ABI=${ABI:-"default"}
101export CFLAGS_default 99export CFLAGS_default
102export LDFLAGS_default 100export LDFLAGS_default
103export CHOST_default=${CHOST_default:-${CHOST}} 101export CHOST_default=${CHOST_default:-${CHOST}}
104export CTARGET_default=${CTARGET_default:-${CTARGET}} 102export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
105export LIBDIR_default=${CONF_LIBDIR:-"lib"} 103export LIBDIR_default=${CONF_LIBDIR:-"lib"}
106export CDEFINE_default="__unix__" 104export CDEFINE_default="__unix__"
107 105
108# has_multilib_profile() 106# has_multilib_profile()
109has_multilib_profile() { 107has_multilib_profile() {
194} 192}
195 193
196get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 194get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; } 195get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
198get_abi_CHOST() { get_abi_var CHOST "$@"; } 196get_abi_CHOST() { get_abi_var CHOST "$@"; }
197get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; } 198get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
200get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
201get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
202 201
203# Return a list of the ABIs we want to install for with 202# Return a list of the ABIs we want to install for with
243# Return a list of the ABIs supported by this profile. 242# Return a list of the ABIs supported by this profile.
244# the last one in the list being the default. 243# the last one in the list being the default.
245get_all_abis() { 244get_all_abis() {
246 local order="" 245 local order=""
247 246
248 if [ -z "${MULTILIB_ABIS}" ]; then 247 if [[ -z ${MULTILIB_ABIS} ]] ; then
249 echo "default" 248 echo "default"
250 return 0 249 return 0
251 fi 250 fi
252 251
253 for x in ${MULTILIB_ABIS}; do 252 for x in ${MULTILIB_ABIS}; do
254 if [ "${x}" != "${DEFAULT_ABI}" ]; then 253 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
255 order="${order:+${order }}${x}" 254 order="${order:+${order} }${x}"
256 fi 255 fi
257 done 256 done
258 order="${order:+${order} }${DEFAULT_ABI}" 257 order="${order:+${order} }${DEFAULT_ABI}"
259 258
260 echo ${order} 259 echo ${order}
267get_all_libdirs() { 266get_all_libdirs() {
268 local libdirs="lib" 267 local libdirs="lib"
269 local abi 268 local abi
270 local dir 269 local dir
271 270
272 if has_multilib_profile; then 271 # Remove when amd64's 2004.3 is purged.
272 if [[ -n "${CONF_LIBDIR}" ]]; then
273 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
274 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
275 done
276 else
273 for abi in ${MULTILIB_ABIS}; do 277 for abi in ${MULTILIB_ABIS}; do
274 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 278 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
275 done
276 elif [ -n "${CONF_LIBDIR}" ]; then
277 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
278 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
279 done 279 done
280 fi 280 fi
281 281
282 echo "${libdirs}" 282 echo "${libdirs}"
283} 283}
532 # exit because we'll likely be called from a subshell 532 # exit because we'll likely be called from a subshell
533 exit 1 533 exit 1
534} 534}
535 535
536get_libname() { 536get_libname() {
537 local libname
537 local ver=$1 538 local ver=$1
538 if use userland_Darwin ; then 539 case ${CHOST} in
540 *-darwin*) libname="dylib";;
541 *) libname="so";;
542 esac
543
539 if [ -z ${ver} ] ; then 544 if [[ -z $@ ]] ; then
540 echo ".dylib" 545 echo ".${libname}"
541 else
542 echo ".${ver}.dylib"
543 fi
544 else 546 else
545 if [ -z ${ver} ] ; then 547 for ver in "$@" ; do
546 echo ".so" 548 case ${CHOST} in
547 else 549 *-darwin*) echo ".${ver}.${libname}";;
548 echo ".so.${ver}" 550 *) echo ".${libname}.${ver}";;
549 fi 551 esac
552 done
550 fi 553 fi
551} 554}
552 555
553# This is for the toolchain to setup profile variables when pulling in 556# This is for the toolchain to setup profile variables when pulling in
554# a crosscompiler (and thus they aren't set in the profile) 557# a crosscompiler (and thus they aren't set in the profile)
555multilib_env() { 558multilib_env() {
556 local CTARGET=$1
557 local CTARGET_post=${CTARGET#*-} 559 local CTARGET=${1:-${CTARGET}}
558 560
559 case $(tc-arch ${CTARGET}) in 561 case ${CTARGET} in
560 amd64) 562 x86_64*)
561 export CFLAGS_x86=${CFLAGS_x86--m32} 563 export CFLAGS_x86=${CFLAGS_x86--m32}
562 export CHOST_x86=i686-${CTARGET_post} 564 export CHOST_x86=${CTARGET/x86_64/i686}
563 export CTARGET_x86=i686-${CTARGET_post} 565 export CTARGET_x86=${CHOST_x86}
564 export CDEFINE_x86="__i386__" 566 export CDEFINE_x86="__i386__"
565 export LIBDIR_x86="lib" 567 export LIBDIR_x86="lib"
566 568
567 export CFLAGS_amd64=${CFLAGS_amd64--m64} 569 export CFLAGS_amd64=${CFLAGS_amd64--m64}
568 export CHOST_amd64=x86_64-${CTARGET_post} 570 export CHOST_amd64=${CTARGET}
569 export CTARGET_amd64=x86_64-${CTARGET_post} 571 export CTARGET_amd64=${CTARGET_amd64}
570 export CDEFINE_amd64="__x86_64__" 572 export CDEFINE_amd64="__x86_64__"
571 export LIBDIR_amd64="lib64" 573 export LIBDIR_amd64="lib64"
572 574
573 export MULTILIB_ABIS="amd64 x86" 575 export MULTILIB_ABIS="amd64 x86"
574 export DEFAULT_ABI="amd64" 576 export DEFAULT_ABI="amd64"
575 ;; 577 ;;
576 mips) 578 mips64*)
577 export CFLAGS_o32=${CFLAGS_o32--mabi=32} 579 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
578 export CHOST_o32=mips-${CTARGET_post} 580 export CHOST_o32=${CTARGET/mips64/mips}
579 export CTARGET_o32=mips-${CTARGET_post} 581 export CTARGET_o32=${CHOST_o32}
580 export CDEFINE_o32="_MIPS_SIM == _ABIO32" 582 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
581 export LIBDIR_o32="lib" 583 export LIBDIR_o32="lib"
582 584
583 export CFLAGS_n32=${CFLAGS_n32--mabi=n32} 585 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
584 export CHOST_n32=mips64-${CTARGET_post} 586 export CHOST_n32=${CTARGET}
585 export CTARGET_n32=mips64-${CTARGET_post} 587 export CTARGET_n32=${CHOST_n32}
586 export CDEFINE_n32="_MIPS_SIM == _ABIN32" 588 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
587 export LIBDIR_n32="lib32" 589 export LIBDIR_n32="lib32"
588 590
589 export CFLAGS_n64=${CFLAGS_n64--mabi=64} 591 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
590 export CHOST_n64=mips64-${CTARGET_post} 592 export CHOST_n64=${CTARGET}
591 export CTARGET_n64=mips64-${CTARGET_post} 593 export CTARGET_n64=${CHOST_n64}
592 export CDEFINE_n64="_MIPS_SIM == _ABI64" 594 export CDEFINE_n64="_MIPS_SIM == _ABI64"
593 export LIBDIR_n64="lib64" 595 export LIBDIR_n64="lib64"
594 596
595 export MULTILIB_ABIS="n64 n32 o32" 597 export MULTILIB_ABIS="n64 n32 o32"
596 case ${CTARGET} in
597 mips64*) export DEFAULT_ABI="n32" ;; 598 export DEFAULT_ABI="n32"
598 *) export DEFAULT_ABI="o32" ;;
599 esac
600 ;; 599 ;;
601 ppc64) 600 powerpc64*)
602 export CFLAGS_ppc=${CFLAGS_ppc--m32} 601 export CFLAGS_ppc=${CFLAGS_ppc--m32}
603 export CHOST_ppc=powerpc-${CTARGET_post} 602 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
604 export CTARGET_ppc=powerpc-${CTARGET_post} 603 export CTARGET_ppc=${CHOST_ppc}
605 export CDEFINE_ppc="!__powerpc64__" 604 export CDEFINE_ppc="!__powerpc64__"
606 export LIBDIR_ppc="lib" 605 export LIBDIR_ppc="lib"
607 606
608 export CFLAGS_ppc64=${CFLAGS_ppc64--m64} 607 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
609 export CHOST_ppc64=powerpc64-${CTARGET_post} 608 export CHOST_ppc64=${CTARGET}
610 export CTARGET_ppc64=powerpc64-${CTARGET_post} 609 export CTARGET_ppc64=${CHOST_ppc64}
611 export CDEFINE_ppc64="__powerpc64__" 610 export CDEFINE_ppc64="__powerpc64__"
612 export LIBDIR_ppc64="lib64" 611 export LIBDIR_ppc64="lib64"
613 612
614 export MULTILIB_ABIS="ppc64 ppc" 613 export MULTILIB_ABIS="ppc64 ppc"
615 export DEFAULT_ABI="ppc64" 614 export DEFAULT_ABI="ppc64"
616 ;; 615 ;;
616 s390x*)
617 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
618 export CHOST_s390=${CTARGET/s390x/s390}
619 export CTARGET_s390=${CHOST_s390}
620 export CDEFINE_s390="!__s390x__"
621 export LIBDIR_s390="lib"
622
623 export CFLAGS_s390x=${CFLAGS_s390x--m64}
624 export CHOST_s390x=${CTARGET}
625 export CTARGET_s390x=${CHOST_s390x}
626 export CDEFINE_s390x="__s390x__"
627 export LIBDIR_s390x="lib64"
628
629 export MULTILIB_ABIS="s390x s390"
630 export DEFAULT_ABI="s390x"
631 ;;
617 sparc) 632 sparc64*)
618 export CFLAGS_sparc32=${CFLAGS_sparc32--m32} 633 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
619 export CHOST_sparc32=sparc-${CTARGET_post} 634 export CHOST_sparc32=${CTARGET/sparc64/sparc}
620 export CTARGET_sparc32=sparc-${CTARGET_post} 635 export CTARGET_sparc32=${CHOST_sparc32}
621 export CDEFINE_sparc32="!__arch64__" 636 export CDEFINE_sparc32="!__arch64__"
622 export LIBDIR_sparc32="lib" 637 export LIBDIR_sparc32="lib"
623 638
624 export CFLAGS_sparc64=${CFLAGS_sparc64--m64} 639 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
625 export CHOST_sparc64=sparc64-${CTARGET_post} 640 export CHOST_sparc64=${CTARGET}
626 export CTARGET_sparc64=sparc64-${CTARGET_post} 641 export CTARGET_sparc64=${CHOST_sparc64}
627 export CDEFINE_sparc64="__arch64__" 642 export CDEFINE_sparc64="__arch64__"
628 export LIBDIR_sparc64="lib64" 643 export LIBDIR_sparc64="lib64"
629 644
630 export MULTILIB_ABIS="sparc64 sparc32" 645 export MULTILIB_ABIS="sparc64 sparc32"
631 case ${CTARGET} in
632 sparc64*) export DEFAULT_ABI="sparc64" ;; 646 export DEFAULT_ABI="sparc64"
633 *) export DEFAULT_ABI="sparc32" ;;
634 esac
635 ;; 647 ;;
636 *) 648 *)
637 export MULTILIB_ABIS="default" 649 export MULTILIB_ABIS="default"
638 export DEFAULT_ABI="default" 650 export DEFAULT_ABI="default"
639 ;; 651 ;;

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.47

  ViewVC Help
Powered by ViewVC 1.1.20