1 |
Rather than setting stuff specific to not-x s390 in the top profile |
2 |
and undoing it for s390x, move it to the new subprofile. |
3 |
|
4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
5 |
--- |
6 |
profiles/arch/s390/make.defaults | 15 +-------------- |
7 |
profiles/arch/s390/s390/make.defaults | 16 ++++++++++++++++ |
8 |
profiles/arch/s390/{ => s390}/package.mask | 0 |
9 |
profiles/arch/s390/s390/use.force | 5 +++++ |
10 |
profiles/arch/s390/s390/use.mask | 9 +++++++++ |
11 |
profiles/arch/s390/s390x/make.defaults | 4 ++-- |
12 |
profiles/arch/s390/s390x/package.mask | 20 -------------------- |
13 |
profiles/arch/s390/s390x/use.force | 3 +-- |
14 |
profiles/arch/s390/s390x/use.mask | 10 ++++------ |
15 |
profiles/arch/s390/use.force | 5 +---- |
16 |
profiles/arch/s390/use.mask | 7 ------- |
17 |
11 files changed, 39 insertions(+), 55 deletions(-) |
18 |
create mode 100644 profiles/arch/s390/s390/make.defaults |
19 |
rename profiles/arch/s390/{ => s390}/package.mask (100%) |
20 |
create mode 100644 profiles/arch/s390/s390/use.force |
21 |
create mode 100644 profiles/arch/s390/s390/use.mask |
22 |
delete mode 100644 profiles/arch/s390/s390x/package.mask |
23 |
|
24 |
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults |
25 |
index fc8cc4a45203..3fde361195fe 100644 |
26 |
--- a/profiles/arch/s390/make.defaults |
27 |
+++ b/profiles/arch/s390/make.defaults |
28 |
@@ -1,14 +1,9 @@ |
29 |
-# Copyright 1999-2021 Gentoo Authors |
30 |
+# Copyright 1999-2022 Gentoo Authors |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
|
33 |
ARCH="s390" |
34 |
ACCEPT_KEYWORDS="s390 ~s390" |
35 |
|
36 |
-MULTILIB_ABIS="s390" |
37 |
-DEFAULT_ABI="s390" |
38 |
-ABI="${DEFAULT_ABI}" |
39 |
- |
40 |
-CHOST="s390-ibm-linux-gnu" |
41 |
CFLAGS="-O2 -pipe" |
42 |
CXXFLAGS="${CFLAGS}" |
43 |
FFLAGS="${CFLAGS}" |
44 |
@@ -20,14 +15,6 @@ LIBDIR_s390="lib" |
45 |
INPUT_DEVICES="void" |
46 |
VIDEO_CARDS="dummy" |
47 |
|
48 |
-# Michał Górny <mgorny@g.o> (2014-07-01) |
49 |
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied |
50 |
-# by non-multilib ebuilds when non-native ABIs are disabled. |
51 |
-IUSE_IMPLICIT="abi_s390_32" |
52 |
- |
53 |
-# Enable abi_s390_32 for packages that don't have it forced. |
54 |
-ABI_S390="32" |
55 |
- |
56 |
# While multilib is available, we don't default it to on. |
57 |
BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib" |
58 |
USE="-multilib" |
59 |
diff --git a/profiles/arch/s390/s390/make.defaults b/profiles/arch/s390/s390/make.defaults |
60 |
new file mode 100644 |
61 |
index 000000000000..8e77858de386 |
62 |
--- /dev/null |
63 |
+++ b/profiles/arch/s390/s390/make.defaults |
64 |
@@ -0,0 +1,16 @@ |
65 |
+# Copyright 1999-2022 Gentoo Authors |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+MULTILIB_ABIS="s390" |
69 |
+DEFAULT_ABI="s390" |
70 |
+ABI="${DEFAULT_ABI}" |
71 |
+ |
72 |
+CHOST="s390-ibm-linux-gnu" |
73 |
+ |
74 |
+# Michał Górny <mgorny@g.o> (2014-07-01) |
75 |
+# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied |
76 |
+# by non-multilib ebuilds when non-native ABIs are disabled. |
77 |
+IUSE_IMPLICIT="abi_s390_32" |
78 |
+ |
79 |
+# Enable abi_s390_32 for packages that don't have it forced. |
80 |
+ABI_S390="32" |
81 |
diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/s390/package.mask |
82 |
similarity index 100% |
83 |
rename from profiles/arch/s390/package.mask |
84 |
rename to profiles/arch/s390/s390/package.mask |
85 |
diff --git a/profiles/arch/s390/s390/use.force b/profiles/arch/s390/s390/use.force |
86 |
new file mode 100644 |
87 |
index 000000000000..6f275ed053ce |
88 |
--- /dev/null |
89 |
+++ b/profiles/arch/s390/s390/use.force |
90 |
@@ -0,0 +1,5 @@ |
91 |
+# Copyright 1999-2022 Gentoo Authors. |
92 |
+# Distributed under the terms of the GNU General Public License, v2 |
93 |
+ |
94 |
+# Force the flag corresponding to the only ABI. |
95 |
+abi_s390_32 |
96 |
diff --git a/profiles/arch/s390/s390/use.mask b/profiles/arch/s390/s390/use.mask |
97 |
new file mode 100644 |
98 |
index 000000000000..ec8bfdf76289 |
99 |
--- /dev/null |
100 |
+++ b/profiles/arch/s390/s390/use.mask |
101 |
@@ -0,0 +1,9 @@ |
102 |
+# Copyright 1999-2022 Gentoo Authors |
103 |
+# Distributed under the terms of the GNU General Public License v2 |
104 |
+ |
105 |
+# Unmask ABI flags for this arch. |
106 |
+-abi_s390_32 |
107 |
+ |
108 |
+# sys-libs/libunwind is masked on s390, but enabled on s390x |
109 |
+unwind |
110 |
+libunwind |
111 |
diff --git a/profiles/arch/s390/s390x/make.defaults b/profiles/arch/s390/s390x/make.defaults |
112 |
index 1cb8ff7551a4..b02ae878cf6e 100644 |
113 |
--- a/profiles/arch/s390/s390x/make.defaults |
114 |
+++ b/profiles/arch/s390/s390x/make.defaults |
115 |
@@ -1,4 +1,4 @@ |
116 |
-# Copyright 1999-2014 Gentoo Foundation |
117 |
+# Copyright 1999-2022 Gentoo Authors |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
|
120 |
MULTILIB_ABIS="s390x" |
121 |
@@ -10,7 +10,7 @@ CHOST="s390x-ibm-linux-gnu" |
122 |
# Michał Górny <mgorny@g.o> (2014-07-01) |
123 |
# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied |
124 |
# by non-multilib ebuilds when non-native ABIs are disabled. |
125 |
-IUSE_IMPLICIT="abi_s390_64 -abi_s390_32" |
126 |
+IUSE_IMPLICIT="abi_s390_64" |
127 |
|
128 |
# Enable abi_s390_64 for packages that don't have it forced. |
129 |
ABI_S390="64" |
130 |
diff --git a/profiles/arch/s390/s390x/package.mask b/profiles/arch/s390/s390x/package.mask |
131 |
deleted file mode 100644 |
132 |
index acf76ebf5f09..000000000000 |
133 |
--- a/profiles/arch/s390/s390x/package.mask |
134 |
+++ /dev/null |
135 |
@@ -1,20 +0,0 @@ |
136 |
-# Copyright 1999-2022 Gentoo Authors |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
- |
139 |
-# Sam James <sam@g.o> (2022-04-25) |
140 |
-# Rust is available for s390x, but not s390. |
141 |
-# bug #769446 |
142 |
--app-eselect/eselect-rust |
143 |
--app-text/mdbook |
144 |
--dev-lang/rust |
145 |
--dev-lang/rust-bin |
146 |
-->=dev-python/cryptography-36 |
147 |
-->=dev-python/pyopenssl-22 |
148 |
--dev-python/setuptools-rust |
149 |
--dev-python/watchfiles |
150 |
--dev-util/maturin |
151 |
--virtual/rust |
152 |
- |
153 |
-# Arthur Zamarin <arthurzam@g.o> (2022-03-20) |
154 |
-# sys-libs/libunwind works on s390x |
155 |
--sys-libs/libunwind |
156 |
diff --git a/profiles/arch/s390/s390x/use.force b/profiles/arch/s390/s390x/use.force |
157 |
index adf5b7184416..d7fa48c83ab9 100644 |
158 |
--- a/profiles/arch/s390/s390x/use.force |
159 |
+++ b/profiles/arch/s390/s390x/use.force |
160 |
@@ -1,6 +1,5 @@ |
161 |
-# Copyright 1999-2014 Gentoo Foundation. |
162 |
+# Copyright 1999-2022 Gentoo Authors. |
163 |
# Distributed under the terms of the GNU General Public License, v2 |
164 |
|
165 |
# Force the flag corresponding to the only ABI. |
166 |
--abi_s390_32 |
167 |
abi_s390_64 |
168 |
diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask |
169 |
index fe2cac38c232..57f5e213dcf5 100644 |
170 |
--- a/profiles/arch/s390/s390x/use.mask |
171 |
+++ b/profiles/arch/s390/s390x/use.mask |
172 |
@@ -1,11 +1,9 @@ |
173 |
-# Switch ABI flags for this arch. |
174 |
-abi_s390_32 |
175 |
+# Copyright 1999-2022 Gentoo Authors |
176 |
+# Distributed under the terms of the GNU General Public License v2 |
177 |
+ |
178 |
+# Unmask ABI flags for this arch. |
179 |
-abi_s390_64 |
180 |
|
181 |
# Sam James <sam@g.o> (2022-05-02) |
182 |
# Rust is available for s390x (but not s390) |
183 |
-rust |
184 |
- |
185 |
-# sys-libs/libunwind is keyworded on s390x |
186 |
--unwind |
187 |
--libunwind |
188 |
diff --git a/profiles/arch/s390/use.force b/profiles/arch/s390/use.force |
189 |
index 89bbb956da41..1ff4f261a6dc 100644 |
190 |
--- a/profiles/arch/s390/use.force |
191 |
+++ b/profiles/arch/s390/use.force |
192 |
@@ -1,11 +1,8 @@ |
193 |
-# Copyright 1999-2014 Gentoo Foundation. |
194 |
+# Copyright 1999-2022 Gentoo Authors. |
195 |
# Distributed under the terms of the GNU General Public License, v2 |
196 |
|
197 |
# Force the flag which corresponds to ARCH. |
198 |
s390 |
199 |
|
200 |
-# Force the flag corresponding to the only ABI. |
201 |
-abi_s390_32 |
202 |
- |
203 |
# We do not have multilib by default. |
204 |
-multilib |
205 |
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask |
206 |
index 1a8fc49c64d4..e41e11486626 100644 |
207 |
--- a/profiles/arch/s390/use.mask |
208 |
+++ b/profiles/arch/s390/use.mask |
209 |
@@ -55,9 +55,6 @@ luajittex |
210 |
# media-libs/libglvnd is not keyworded |
211 |
libglvnd |
212 |
|
213 |
-# Unmask ABI flags for this arch. |
214 |
--abi_s390_32 |
215 |
- |
216 |
# James Le Cuirot <chewi@g.o> (2017-06-29) |
217 |
# Unmask as this profile is big endian. |
218 |
-big-endian |
219 |
@@ -152,7 +149,3 @@ video_cards_radeonsi |
220 |
# Chí-Thanh Christopher Nguyễn <chithanh@g.o> (2013-08-22) |
221 |
# virtual/opencl is not keyworded |
222 |
opencl |
223 |
- |
224 |
-# sys-libs/libunwind is masked on s390, but enabled on s390x |
225 |
-unwind |
226 |
-libunwind |
227 |
-- |
228 |
2.35.1 |