summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-01-21 11:24:50 +0100
committerMichał Górny <mgorny@gentoo.org>2017-02-01 13:27:06 +0100
commitcd566f05c030100ac7b097d094cd36f16f955d6c (patch)
tree072194bb120080aeafa7fcfd7349b5998e024914 /profiles/arch
parentprofiles/*/amd64/*/no-multilib: stop using features/64bit-native (diff)
downloadgentoo-cd566f05c030100ac7b097d094cd36f16f955d6c.tar.gz
gentoo-cd566f05c030100ac7b097d094cd36f16f955d6c.tar.bz2
gentoo-cd566f05c030100ac7b097d094cd36f16f955d6c.zip
profiles/*/ppc64: stop using features/64bit-native
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/powerpc/ppc64/64le/make.defaults6
-rw-r--r--profiles/arch/powerpc/ppc64/64le/parent1
-rw-r--r--profiles/arch/powerpc/ppc64/64le/use.mask7
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/make.defaults5
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/parent1
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/use.mask4
6 files changed, 20 insertions, 4 deletions
diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults
index 3f18179c2231..64cad24bb366 100644
--- a/profiles/arch/powerpc/ppc64/64le/make.defaults
+++ b/profiles/arch/powerpc/ppc64/64le/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,3 +7,7 @@ CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
FFLAGS="${CFLAGS}"
FCFLAGS="${CFLAGS}"
+
+# moved from 64bit-native, TODO: move it upwards
+SYMLINK_LIB="yes"
+LIBDIR_ppc64="lib64"
diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent
index 00012cfe73e4..f3229c5b9876 100644
--- a/profiles/arch/powerpc/ppc64/64le/parent
+++ b/profiles/arch/powerpc/ppc64/64le/parent
@@ -1,2 +1 @@
-../../../../features/64bit-native
..
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
new file mode 100644
index 000000000000..dc7ace0c8e46
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
+# Mask multilib, since we cannot use it.
+multilib
diff --git a/profiles/arch/powerpc/ppc64/64ul/make.defaults b/profiles/arch/powerpc/ppc64/64ul/make.defaults
index d740c6b24d38..02dca659c5ca 100644
--- a/profiles/arch/powerpc/ppc64/64ul/make.defaults
+++ b/profiles/arch/powerpc/ppc64/64ul/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,3 +9,6 @@ MULTILIB_ABIS="ppc64"
CFLAGS_ppc64="-m64"
+# moved from 64bit-native, TODO: move it upwards
+SYMLINK_LIB="yes"
+LIBDIR_ppc64="lib64"
diff --git a/profiles/arch/powerpc/ppc64/64ul/parent b/profiles/arch/powerpc/ppc64/64ul/parent
index 00012cfe73e4..f3229c5b9876 100644
--- a/profiles/arch/powerpc/ppc64/64ul/parent
+++ b/profiles/arch/powerpc/ppc64/64ul/parent
@@ -1,2 +1 @@
-../../../../features/64bit-native
..
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 6a1af02e7e9f..cea52a136d86 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -76,3 +76,7 @@ audit
# unregisterised ghc arch for now.
# no ghci - no TH
template_haskell
+
+# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
+# Mask multilib, since we cannot use it.
+multilib