summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2016-04-30 12:42:05 +0200
committerFabian Groffen <grobian@gentoo.org>2016-04-30 12:42:05 +0200
commit5333aa779e7c0c61b1010d74b3743cbc80d3f4f8 (patch)
tree4a3dba41c7d250740473654e2f8a775465c43da0
parentprofiles/prefix/sunos/soaris: decouple x64 from x86 because ABI is not the same (diff)
downloadgentoo-5333aa77.tar.gz
gentoo-5333aa77.tar.bz2
gentoo-5333aa77.zip
profiles/prefix/sunos/soaris: force/unmask ABI flags for multilib-build
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/use.force3
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/use.mask7
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/use.force3
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/use.mask7
4 files changed, 18 insertions, 2 deletions
diff --git a/profiles/prefix/sunos/solaris/arch/x64/use.force b/profiles/prefix/sunos/solaris/arch/x64/use.force
index 953c26144a82..155d4f924982 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/use.force
+++ b/profiles/prefix/sunos/solaris/arch/x64/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Force the flag corresponding to the default ABI
+x64-solaris
abi_x86_64
diff --git a/profiles/prefix/sunos/solaris/arch/x64/use.mask b/profiles/prefix/sunos/solaris/arch/x64/use.mask
new file mode 100644
index 000000000000..fe804032c0f2
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/arch/x64/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Unmask the flag corresponding to the default ABI
+-x64-solaris
+-abi_x86_64
diff --git a/profiles/prefix/sunos/solaris/arch/x86/use.force b/profiles/prefix/sunos/solaris/arch/x86/use.force
index 63240617d472..a9f3cc610623 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/use.force
+++ b/profiles/prefix/sunos/solaris/arch/x86/use.force
@@ -1,6 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Force the flag corresponding to the default ABI
+x86-solaris
abi_x86_32
diff --git a/profiles/prefix/sunos/solaris/arch/x86/use.mask b/profiles/prefix/sunos/solaris/arch/x86/use.mask
new file mode 100644
index 000000000000..e680de7bfb6b
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/arch/x86/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Unmask the flag corresponding to the default ABI
+-x86-solaris
+-abi_x86_32