summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-07-01 07:49:58 +0000
committerMichał Górny <mgorny@gentoo.org>2014-07-01 07:49:58 +0000
commit0e3b7ae0a9a46c67bd0a7c0c711185cb85187a3c (patch)
tree17c1c75ba0e708b06d684fe3714419b61c20948b
parentSet default ABI_X86 and IUSE_IMPLICIT. (diff)
downloadgentoo-2-0e3b7ae0a9a46c67bd0a7c0c711185cb85187a3c.tar.gz
gentoo-2-0e3b7ae0a9a46c67bd0a7c0c711185cb85187a3c.tar.bz2
gentoo-2-0e3b7ae0a9a46c67bd0a7c0c711185cb85187a3c.zip
Set default ABI_X86 and IUSE_IMPLICIT.
-rw-r--r--profiles/arch/x86-fbsd/ChangeLog5
-rw-r--r--profiles/arch/x86-fbsd/make.defaults13
2 files changed, 15 insertions, 3 deletions
diff --git a/profiles/arch/x86-fbsd/ChangeLog b/profiles/arch/x86-fbsd/ChangeLog
index a593acc5fd1b..54db1c6d309b 100644
--- a/profiles/arch/x86-fbsd/ChangeLog
+++ b/profiles/arch/x86-fbsd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo/x86-fbsd profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/ChangeLog,v 1.45 2014/06/20 13:48:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/ChangeLog,v 1.46 2014/07/01 07:49:58 mgorny Exp $
+
+ 01 Jul 2014; Michał Górny <mgorny@gentoo.org> make.defaults:
+ Set default ABI_X86 and IUSE_IMPLICIT.
20 Jun 2014; Michał Górny <mgorny@gentoo.org> make.defaults:
Set amd64-fbsd-compatible values for ABI and related variables.
diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults
index f9a1b32a8a1f..f5eb907ca079 100644
--- a/profiles/arch/x86-fbsd/make.defaults
+++ b/profiles/arch/x86-fbsd/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/make.defaults,v 1.6 2014/06/20 13:48:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/make.defaults,v 1.7 2014/07/01 07:49:58 mgorny Exp $
# System-wide defaults for the G/FBSD Portage system
ARCH="x86-fbsd"
@@ -23,3 +23,12 @@ LIBDIR_x86_fbsd="lib"
VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
sisusb tga trident tseng via vmware"
+
+# Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
+# Default to abi_x86_32 for packages that don't have it forced.
+ABI_X86="32"
+
+# Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
+# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
+# by non-multilib ebuilds when non-native ABIs are disabled.
+IUSE_IMPLICIT="abi_x86_32"