profiles/*/ppc64: stop using features/64bit-native

diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults
index 3f18179c22317e020f85bc970c6320a7dd146322..64cad24bb3661f0ba4b0cd195eb713f646cb8ab4 100644 (file)
--- 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 00012cfe73e429871d263b0c679cbc2925513654..f3229c5b98768fac9af7b7ba56da9c071958d0f3 100644 (file)
--- 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 (file)
index 0000000..dc7ace0
--- /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 d740c6b24d386eacb7913171fd9034a7b16f7b47..02dca659c5ca45bd5544eaa458d3f31d4f890fc5 100644 (file)
--- 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 00012cfe73e429871d263b0c679cbc2925513654..f3229c5b98768fac9af7b7ba56da9c071958d0f3 100644 (file)
--- 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 6a1af02e7e9ffd85323d5bae4d42963c431641f8..cea52a136d8625b6ebdc956f270439c24b804e68 100644 (file)
--- 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

diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
new file mode 100644 (file)
index 0000000..26e49fc
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# moved from features/64bit-native
+# TODO: figure out how to inherit this from arch profile
+SYMLINK_LIB="yes"
+LIBDIR_ppc64="lib64"

diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
index 52bcba73e7a52347f572213641b48f257e484773..f3229c5b98768fac9af7b7ba56da9c071958d0f3 100644 (file)
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
@@ -1,2 +1 @@
 ..
-../../../../../features/64bit-native