From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 29 Apr 2016 12:47:16 +0000 (+0200)
Subject: profiles/prefix/darwin/macos: add appropriate mask/force for ABI USE-flags, bug ... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=872effffd3541b475cf1e9d0a7d0021621aab137;p=gentoo.git

profiles/prefix/darwin/macos: add appropriate mask/force for ABI USE-flags, bug #579454
---

diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.force b/profiles/prefix/darwin/macos/arch/ppc/use.force
index 50b02bfe9d30..63e95a321613 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/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
+ppc-macos
 abi_ppc_32
diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.mask b/profiles/prefix/darwin/macos/arch/ppc/use.mask
new file mode 100644
index 000000000000..2c96250473af
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/ppc/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
+-ppc-macos
+-abi_ppc_32
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.force b/profiles/prefix/darwin/macos/arch/x64/use.force
index 953c26144a82..b6d39471032a 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.force
+++ b/profiles/prefix/darwin/macos/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-macos
 abi_x86_64
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask b/profiles/prefix/darwin/macos/arch/x64/use.mask
new file mode 100644
index 000000000000..9702d753cb16
--- /dev/null
+++ b/profiles/prefix/darwin/macos/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-macos
+-abi_x86_64
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force b/profiles/prefix/darwin/macos/arch/x86/use.force
index 63240617d472..8f00cb9e61bf 100644
--- a/profiles/prefix/darwin/macos/arch/x86/use.force
+++ b/profiles/prefix/darwin/macos/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-macos
 abi_x86_32
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask b/profiles/prefix/darwin/macos/arch/x86/use.mask
new file mode 100644
index 000000000000..3ab486656a91
--- /dev/null
+++ b/profiles/prefix/darwin/macos/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-macos
+-abi_x86_32