diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-07-27 23:57:57 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-07-27 23:57:57 +0000 |
| commit | effc8515303d63abeb876c84ac60538693cf2eec (patch) | |
| tree | b598898b3d1266c0421970db3c13a9ef2be6767d /profiles | |
| parent | Add missing dependency, per configure. (diff) | |
| download | gentoo-2-effc8515303d63abeb876c84ac60538693cf2eec.tar.gz gentoo-2-effc8515303d63abeb876c84ac60538693cf2eec.tar.bz2 gentoo-2-effc8515303d63abeb876c84ac60538693cf2eec.zip | |
add support for multilib eclasses, bug #475294 by Yuta SATOH
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/amd64-fbsd/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/arch/amd64-fbsd/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/arch/amd64-fbsd/use.force | 3 | ||||
| -rw-r--r-- | profiles/arch/amd64-fbsd/use.mask | 6 |
4 files changed, 17 insertions, 3 deletions
diff --git a/profiles/arch/amd64-fbsd/ChangeLog b/profiles/arch/amd64-fbsd/ChangeLog index 1edfc23f7d0c..2caf92520868 100644 --- a/profiles/arch/amd64-fbsd/ChangeLog +++ b/profiles/arch/amd64-fbsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo/x86-fbsd profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.39 2013/07/08 02:08:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.40 2013/07/27 23:57:56 aballier Exp $ + + 27 Jul 2013; Alexis Ballier <aballier@gentoo.org> make.defaults, use.force, + use.mask: + add support for multilib eclasses, bug #475294 by Yuta SATOH 08 Jul 2013; Alexis Ballier <aballier@gentoo.org> make.defaults: Add CFLAGS and LDFLAGS so that gcc finds the needed files and libraries when diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults index 6359f6361e04..1b45d6274311 100644 --- a/profiles/arch/amd64-fbsd/make.defaults +++ b/profiles/arch/amd64-fbsd/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v 1.12 2013/07/08 02:08:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v 1.13 2013/07/27 23:57:56 aballier Exp $ # System-wide defaults for the G/FBSD Portage system ARCH="amd64-fbsd" @@ -33,3 +33,6 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \ LIBDIR_amd64_fbsd="lib" MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32" SYMLINK_LIB="no" + +# Unmask multilib ABIs use expands. +USE_EXPAND_HIDDEN="-ABI_X86" diff --git a/profiles/arch/amd64-fbsd/use.force b/profiles/arch/amd64-fbsd/use.force index bb4a4928f928..9dc35a08b0f3 100644 --- a/profiles/arch/amd64-fbsd/use.force +++ b/profiles/arch/amd64-fbsd/use.force @@ -1,2 +1,5 @@ # Force the flag which corresponds to ARCH. amd64-fbsd + +# Multilib flag for default ABI +abi_x86_64 diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask index 169fa220eab6..073727c841e4 100644 --- a/profiles/arch/amd64-fbsd/use.mask +++ b/profiles/arch/amd64-fbsd/use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/use.mask,v 1.15 2013/05/13 15:56:31 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/use.mask,v 1.16 2013/07/27 23:57:57 aballier Exp $ # Unmask the flag which corresponds to ARCH. -amd64-fbsd @@ -48,3 +48,7 @@ python_single_target_python3_1 # Diego Elio Pettenò <flameeyes@gentoo.org> (21 Aug 2012) # IPMI is only implemented for x86, amd64 and ia64 -ipmi + +# Multilib ABIs +-abi_x86_32 +-abi_x86_64 |