Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 4/8] profiles/*/ppc64: stop using features/64bit-native
Date: Sat, 21 Jan 2017 23:02:49
Message-Id: 20170121225947.11433-5-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess by "Michał Górny"
1 ---
2 profiles/arch/powerpc/ppc64/64le/make.defaults | 6 +++++-
3 profiles/arch/powerpc/ppc64/64le/parent | 1 -
4 profiles/arch/powerpc/ppc64/64le/use.mask | 7 +++++++
5 profiles/arch/powerpc/ppc64/64ul/make.defaults | 5 ++++-
6 profiles/arch/powerpc/ppc64/64ul/parent | 1 -
7 profiles/arch/powerpc/ppc64/64ul/use.mask | 4 ++++
8 .../hardened/linux/powerpc/ppc64/64bit-userland/make.defaults | 8 ++++++++
9 profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent | 1 -
10 8 files changed, 28 insertions(+), 5 deletions(-)
11 create mode 100644 profiles/arch/powerpc/ppc64/64le/use.mask
12 create mode 100644 profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
13
14 diff --git a/profiles/arch/powerpc/ppc64/64le/make.defaults b/profiles/arch/powerpc/ppc64/64le/make.defaults
15 index 3f18179c2231..64cad24bb366 100644
16 --- a/profiles/arch/powerpc/ppc64/64le/make.defaults
17 +++ b/profiles/arch/powerpc/ppc64/64le/make.defaults
18 @@ -1,4 +1,4 @@
19 -# Copyright 1999-2015 Gentoo Foundation
20 +# Copyright 1999-2017 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 # $Id$
23
24 @@ -7,3 +7,7 @@ CFLAGS="-O2 -pipe"
25 CXXFLAGS="${CFLAGS}"
26 FFLAGS="${CFLAGS}"
27 FCFLAGS="${CFLAGS}"
28 +
29 +# moved from 64bit-native, TODO: move it upwards
30 +SYMLINK_LIB="yes"
31 +LIBDIR_ppc64="lib64"
32 diff --git a/profiles/arch/powerpc/ppc64/64le/parent b/profiles/arch/powerpc/ppc64/64le/parent
33 index 00012cfe73e4..f3229c5b9876 100644
34 --- a/profiles/arch/powerpc/ppc64/64le/parent
35 +++ b/profiles/arch/powerpc/ppc64/64le/parent
36 @@ -1,2 +1 @@
37 -../../../../features/64bit-native
38 ..
39 diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
40 new file mode 100644
41 index 000000000000..dc7ace0c8e46
42 --- /dev/null
43 +++ b/profiles/arch/powerpc/ppc64/64le/use.mask
44 @@ -0,0 +1,7 @@
45 +# Copyright 1999-2017 Gentoo Foundation
46 +# Distributed under the terms of the GNU General Public License v2
47 +# $Id$
48 +
49 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
50 +# Mask multilib, since we cannot use it.
51 +multilib
52 diff --git a/profiles/arch/powerpc/ppc64/64ul/make.defaults b/profiles/arch/powerpc/ppc64/64ul/make.defaults
53 index d740c6b24d38..02dca659c5ca 100644
54 --- a/profiles/arch/powerpc/ppc64/64ul/make.defaults
55 +++ b/profiles/arch/powerpc/ppc64/64ul/make.defaults
56 @@ -1,4 +1,4 @@
57 -# Copyright 1999-2008 Gentoo Foundation
58 +# Copyright 1999-2017 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 # $Id$
61
62 @@ -9,3 +9,6 @@ MULTILIB_ABIS="ppc64"
63
64 CFLAGS_ppc64="-m64"
65
66 +# moved from 64bit-native, TODO: move it upwards
67 +SYMLINK_LIB="yes"
68 +LIBDIR_ppc64="lib64"
69 diff --git a/profiles/arch/powerpc/ppc64/64ul/parent b/profiles/arch/powerpc/ppc64/64ul/parent
70 index 00012cfe73e4..f3229c5b9876 100644
71 --- a/profiles/arch/powerpc/ppc64/64ul/parent
72 +++ b/profiles/arch/powerpc/ppc64/64ul/parent
73 @@ -1,2 +1 @@
74 -../../../../features/64bit-native
75 ..
76 diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
77 index 6a1af02e7e9f..cea52a136d86 100644
78 --- a/profiles/arch/powerpc/ppc64/64ul/use.mask
79 +++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
80 @@ -76,3 +76,7 @@ audit
81 # unregisterised ghc arch for now.
82 # no ghci - no TH
83 template_haskell
84 +
85 +# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
86 +# Mask multilib, since we cannot use it.
87 +multilib
88 diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
89 new file mode 100644
90 index 000000000000..26e49fcee5b7
91 --- /dev/null
92 +++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/make.defaults
93 @@ -0,0 +1,8 @@
94 +# Copyright 1999-2017 Gentoo Foundation
95 +# Distributed under the terms of the GNU General Public License v2
96 +# $Id$
97 +
98 +# moved from features/64bit-native
99 +# TODO: figure out how to inherit this from arch profile
100 +SYMLINK_LIB="yes"
101 +LIBDIR_ppc64="lib64"
102 diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
103 index 52bcba73e7a5..f3229c5b9876 100644
104 --- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
105 +++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
106 @@ -1,2 +1 @@
107 ..
108 -../../../../../features/64bit-native
109 --
110 2.11.0