| 1 |
commit: cd566f05c030100ac7b097d094cd36f16f955d6c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 21 10:24:50 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 12:27:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd566f05 |
| 7 |
|
| 8 |
profiles/*/ppc64: stop using features/64bit-native |
| 9 |
|
| 10 |
profiles/arch/powerpc/ppc64/64le/make.defaults | 6 +++++- |
| 11 |
profiles/arch/powerpc/ppc64/64le/parent | 1 - |
| 12 |
profiles/arch/powerpc/ppc64/64le/use.mask | 7 +++++++ |
| 13 |
profiles/arch/powerpc/ppc64/64ul/make.defaults | 5 ++++- |
| 14 |
profiles/arch/powerpc/ppc64/64ul/parent | 1 - |
| 15 |
profiles/arch/powerpc/ppc64/64ul/use.mask | 4 ++++ |
| 16 |
.../hardened/linux/powerpc/ppc64/64bit-userland/make.defaults | 8 ++++++++ |
| 17 |
profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent | 1 - |
| 18 |
8 files changed, 28 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults |
| 21 |
index 3f18179..64cad24 100644 |
| 22 |
--- a/profiles/arch/powerpc/ppc64/64le/make.defaults |
| 23 |
+++ b/profiles/arch/powerpc/ppc64/64le/make.defaults |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2015 Gentoo Foundation |
| 26 |
+# Copyright 1999-2017 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
|
| 30 |
@@ -7,3 +7,7 @@ CFLAGS="-O2 -pipe" |
| 31 |
CXXFLAGS="${CFLAGS}" |
| 32 |
FFLAGS="${CFLAGS}" |
| 33 |
FCFLAGS="${CFLAGS}" |
| 34 |
+ |
| 35 |
+# moved from 64bit-native, TODO: move it upwards |
| 36 |
+SYMLINK_LIB="yes" |
| 37 |
+LIBDIR_ppc64="lib64" |
| 38 |
|
| 39 |
diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent |
| 40 |
index 00012cf..f3229c5b 100644 |
| 41 |
--- a/profiles/arch/powerpc/ppc64/64le/parent |
| 42 |
+++ b/profiles/arch/powerpc/ppc64/64le/parent |
| 43 |
@@ -1,2 +1 @@ |
| 44 |
-../../../../features/64bit-native |
| 45 |
.. |
| 46 |
|
| 47 |
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask |
| 48 |
new file mode 100644 |
| 49 |
index 00000000..dc7ace0 |
| 50 |
--- /dev/null |
| 51 |
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask |
| 52 |
@@ -0,0 +1,7 @@ |
| 53 |
+# Copyright 1999-2017 Gentoo Foundation |
| 54 |
+# Distributed under the terms of the GNU General Public License v2 |
| 55 |
+# $Id$ |
| 56 |
+ |
| 57 |
+# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o> |
| 58 |
+# Mask multilib, since we cannot use it. |
| 59 |
+multilib |
| 60 |
|
| 61 |
diff --git a/profiles/arch/powerpc/ppc64/64ul/make.defaults b/profiles/arch/powerpc/ppc64/64ul/make.defaults |
| 62 |
index d740c6b..02dca65 100644 |
| 63 |
--- a/profiles/arch/powerpc/ppc64/64ul/make.defaults |
| 64 |
+++ b/profiles/arch/powerpc/ppc64/64ul/make.defaults |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2008 Gentoo Foundation |
| 67 |
+# Copyright 1999-2017 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
@@ -9,3 +9,6 @@ MULTILIB_ABIS="ppc64" |
| 72 |
|
| 73 |
CFLAGS_ppc64="-m64" |
| 74 |
|
| 75 |
+# moved from 64bit-native, TODO: move it upwards |
| 76 |
+SYMLINK_LIB="yes" |
| 77 |
+LIBDIR_ppc64="lib64" |
| 78 |
|
| 79 |
diff --git a/profiles/arch/powerpc/ppc64/64ul/parent b/profiles/arch/powerpc/ppc64/64ul/parent |
| 80 |
index 00012cf..f3229c5b 100644 |
| 81 |
--- a/profiles/arch/powerpc/ppc64/64ul/parent |
| 82 |
+++ b/profiles/arch/powerpc/ppc64/64ul/parent |
| 83 |
@@ -1,2 +1 @@ |
| 84 |
-../../../../features/64bit-native |
| 85 |
.. |
| 86 |
|
| 87 |
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask |
| 88 |
index 6a1af02..cea52a1 100644 |
| 89 |
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask |
| 90 |
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask |
| 91 |
@@ -76,3 +76,7 @@ audit |
| 92 |
# unregisterised ghc arch for now. |
| 93 |
# no ghci - no TH |
| 94 |
template_haskell |
| 95 |
+ |
| 96 |
+# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o> |
| 97 |
+# Mask multilib, since we cannot use it. |
| 98 |
+multilib |
| 99 |
|
| 100 |
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults |
| 101 |
new file mode 100644 |
| 102 |
index 00000000..26e49fc |
| 103 |
--- /dev/null |
| 104 |
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults |
| 105 |
@@ -0,0 +1,8 @@ |
| 106 |
+# Copyright 1999-2017 Gentoo Foundation |
| 107 |
+# Distributed under the terms of the GNU General Public License v2 |
| 108 |
+# $Id$ |
| 109 |
+ |
| 110 |
+# moved from features/64bit-native |
| 111 |
+# TODO: figure out how to inherit this from arch profile |
| 112 |
+SYMLINK_LIB="yes" |
| 113 |
+LIBDIR_ppc64="lib64" |
| 114 |
|
| 115 |
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent |
| 116 |
index 52bcba7..f3229c5b 100644 |
| 117 |
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent |
| 118 |
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent |
| 119 |
@@ -1,2 +1 @@ |
| 120 |
.. |
| 121 |
-../../../../../features/64bit-native |
Archives