Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/mips/17.0/mipsel/n64/musl/, profiles/, ...
Date: Sun, 19 Mar 2023 03:23:02
Message-Id: 1679195797.711c0c802fda934c7b84f9ef274f320fc9edd273.sam@gentoo
1 commit: 711c0c802fda934c7b84f9ef274f320fc9edd273
2 Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Tue Mar 14 00:07:54 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 03:16:37 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711c0c80
7
8 profiles/default/linux/mips: reorganize for proper inheritance
9
10 musl profiles should be subprofiles of the corresponding non-musl
11 profiles, rather than top-level profiles below their relevant arch.
12 Otherwise inheritance is incorrect and results in overwriting
13 customizations from the musl feature profile.
14
15 Bug: https://bugs.gentoo.org/896096
16 Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com>
17 Closes: https://github.com/gentoo/gentoo/pull/30049
18 Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20 profiles/default/linux/mips/17.0/{ => mipsel/n64}/musl/eapi | 0
21 .../mips/17.0/{musl/mipsel/n64 => mipsel/n64/musl}/make.defaults | 5 ++++-
22 profiles/default/linux/mips/17.0/mipsel/n64/musl/parent | 3 +++
23 .../default/linux/mips/17.0/{musl/mipsel => mipsel/o32/musl}/eapi | 0
24 .../mips/17.0/{musl/mipsel => mipsel/o32/musl}/make.defaults | 6 +++++-
25 profiles/default/linux/mips/17.0/mipsel/o32/musl/parent | 3 +++
26 profiles/default/linux/mips/17.0/musl/mipsel/n64/parent | 2 --
27 profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults | 6 ------
28 profiles/default/linux/mips/17.0/musl/mipsel/o32/parent | 2 --
29 profiles/default/linux/mips/17.0/musl/mipsel/parent | 2 --
30 profiles/default/linux/mips/17.0/musl/n64/parent | 2 --
31 profiles/default/linux/mips/17.0/musl/o32/parent | 2 --
32 profiles/default/linux/mips/17.0/musl/parent | 3 ---
33 .../default/linux/mips/17.0/{musl/mipsel/n64 => n64/musl}/eapi | 0
34 .../linux/mips/{23.0/musl/n64 => 17.0/n64/musl}/make.defaults | 2 +-
35 profiles/default/linux/mips/17.0/n64/musl/parent | 3 +++
36 .../default/linux/mips/17.0/{musl/mipsel/o32 => o32/musl}/eapi | 0
37 .../default/linux/mips/17.0/{musl/o32 => o32/musl}/make.defaults | 2 +-
38 profiles/default/linux/mips/17.0/o32/musl/parent | 3 +++
39 .../linux/mips/{17.0/musl/n64 => 23.0/mipsel/n64/musl}/eapi | 0
40 .../mips/23.0/{musl/mipsel/n64 => mipsel/n64/musl}/make.defaults | 5 ++++-
41 profiles/default/linux/mips/23.0/mipsel/n64/musl/parent | 3 +++
42 .../linux/mips/{17.0/musl/o32 => 23.0/mipsel/o32/musl}/eapi | 0
43 .../mips/23.0/{musl/mipsel => mipsel/o32/musl}/make.defaults | 6 +++++-
44 profiles/default/linux/mips/23.0/mipsel/o32/musl/parent | 3 +++
45 profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi | 1 -
46 profiles/default/linux/mips/23.0/musl/mipsel/n64/parent | 2 --
47 profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi | 1 -
48 profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults | 6 ------
49 profiles/default/linux/mips/23.0/musl/mipsel/o32/parent | 2 --
50 profiles/default/linux/mips/23.0/musl/mipsel/parent | 2 --
51 profiles/default/linux/mips/23.0/musl/n64/eapi | 1 -
52 profiles/default/linux/mips/23.0/musl/n64/parent | 2 --
53 profiles/default/linux/mips/23.0/musl/o32/eapi | 1 -
54 profiles/default/linux/mips/23.0/musl/o32/parent | 2 --
55 profiles/default/linux/mips/23.0/musl/parent | 3 ---
56 profiles/default/linux/mips/23.0/{ => n64}/musl/eapi | 0
57 .../linux/mips/{17.0/musl/n64 => 23.0/n64/musl}/make.defaults | 2 +-
58 profiles/default/linux/mips/23.0/n64/musl/parent | 3 +++
59 profiles/default/linux/mips/23.0/{musl/mipsel => o32/musl}/eapi | 0
60 .../default/linux/mips/23.0/{musl/o32 => o32/musl}/make.defaults | 2 +-
61 profiles/default/linux/mips/23.0/o32/musl/parent | 3 +++
62 profiles/profiles.desc | 8 ++++----
63 43 files changed, 50 insertions(+), 54 deletions(-)
64
65 diff --git a/profiles/default/linux/mips/17.0/musl/eapi b/profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
66 similarity index 100%
67 rename from profiles/default/linux/mips/17.0/musl/eapi
68 rename to profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
69
70 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
71 similarity index 54%
72 rename from profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
73 rename to profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
74 index 26dbb0e4c1dc..cb0c7807a72f 100644
75 --- a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
76 +++ b/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
77 @@ -1,6 +1,9 @@
78 -# Copyright 2022 Gentoo Authors
79 +# Copyright 2022-2023 Gentoo Authors
80 # Distributed under the terms of the GNU General Public License v2
81
82 CHOST="mips64el-gentoo-linux-musl"
83 CHOST_n64="${CHOST}"
84 LIBDIR_n64="lib"
85 +
86 +# Disable sandbox because its currently broken on mipsel-musl
87 +FEATURES="-sandbox"
88
89 diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent b/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
90 new file mode 100644
91 index 000000000000..a3de2bcf95f7
92 --- /dev/null
93 +++ b/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
94 @@ -0,0 +1,3 @@
95 +..
96 +../../../../../../../features/musl
97 +../../../../../../../features/wd40
98
99 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/eapi b/profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
100 similarity index 100%
101 rename from profiles/default/linux/mips/17.0/musl/mipsel/eapi
102 rename to profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
103
104 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults b/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
105 similarity index 57%
106 rename from profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
107 rename to profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
108 index 53daa27ad9fb..d19638d73590 100644
109 --- a/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
110 +++ b/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
111 @@ -1,5 +1,9 @@
112 -# Copyright 2022 Gentoo Authors
113 +# Copyright 2022-2023 Gentoo Authors
114 # Distributed under the terms of the GNU General Public License v2
115
116 +CHOST="mipsel-gentoo-linux-musl"
117 +CHOST_o32="${CHOST}"
118 +LIBDIR_o32="lib"
119 +
120 # Disable sandbox because its currently broken on mipsel-musl
121 FEATURES="-sandbox"
122
123 diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent b/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
124 new file mode 100644
125 index 000000000000..a3de2bcf95f7
126 --- /dev/null
127 +++ b/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
128 @@ -0,0 +1,3 @@
129 +..
130 +../../../../../../../features/musl
131 +../../../../../../../features/wd40
132
133 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
134 deleted file mode 100644
135 index e92fcf7cbf75..000000000000
136 --- a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
137 +++ /dev/null
138 @@ -1,2 +0,0 @@
139 -..
140 -../../../../../../../arch/mips/mipsel/mips64el/n64
141
142 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
143 deleted file mode 100644
144 index d0dec15ac7be..000000000000
145 --- a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
146 +++ /dev/null
147 @@ -1,6 +0,0 @@
148 -# Copyright 2022 Gentoo Authors
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -CHOST="mipsel-gentoo-linux-musl"
152 -CHOST_o32="${CHOST}"
153 -LIBDIR_o32="lib"
154
155 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
156 deleted file mode 100644
157 index 85db6caf16e5..000000000000
158 --- a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
159 +++ /dev/null
160 @@ -1,2 +0,0 @@
161 -..
162 -../../../../../../../arch/mips/mipsel/o32
163
164 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/parent b/profiles/default/linux/mips/17.0/musl/mipsel/parent
165 deleted file mode 100644
166 index f2bcf2737c18..000000000000
167 --- a/profiles/default/linux/mips/17.0/musl/mipsel/parent
168 +++ /dev/null
169 @@ -1,2 +0,0 @@
170 -..
171 -../../../../../../arch/mips/mipsel
172
173 diff --git a/profiles/default/linux/mips/17.0/musl/n64/parent b/profiles/default/linux/mips/17.0/musl/n64/parent
174 deleted file mode 100644
175 index 0a2e2f270682..000000000000
176 --- a/profiles/default/linux/mips/17.0/musl/n64/parent
177 +++ /dev/null
178 @@ -1,2 +0,0 @@
179 -..
180 -../../../../../../arch/mips/mips64/n64
181
182 diff --git a/profiles/default/linux/mips/17.0/musl/o32/parent b/profiles/default/linux/mips/17.0/musl/o32/parent
183 deleted file mode 100644
184 index 6d4edaa24a38..000000000000
185 --- a/profiles/default/linux/mips/17.0/musl/o32/parent
186 +++ /dev/null
187 @@ -1,2 +0,0 @@
188 -..
189 -../../../../../../arch/mips/o32
190
191 diff --git a/profiles/default/linux/mips/17.0/musl/parent b/profiles/default/linux/mips/17.0/musl/parent
192 deleted file mode 100644
193 index 9ef7663a23b6..000000000000
194 --- a/profiles/default/linux/mips/17.0/musl/parent
195 +++ /dev/null
196 @@ -1,3 +0,0 @@
197 -..
198 -../../../../../features/musl
199 -../../../../../features/wd40
200
201 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi b/profiles/default/linux/mips/17.0/n64/musl/eapi
202 similarity index 100%
203 rename from profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
204 rename to profiles/default/linux/mips/17.0/n64/musl/eapi
205
206 diff --git a/profiles/default/linux/mips/23.0/musl/n64/make.defaults b/profiles/default/linux/mips/17.0/n64/musl/make.defaults
207 similarity index 78%
208 rename from profiles/default/linux/mips/23.0/musl/n64/make.defaults
209 rename to profiles/default/linux/mips/17.0/n64/musl/make.defaults
210 index 90dd88675350..594d429605ee 100644
211 --- a/profiles/default/linux/mips/23.0/musl/n64/make.defaults
212 +++ b/profiles/default/linux/mips/17.0/n64/musl/make.defaults
213 @@ -1,4 +1,4 @@
214 -# Copyright 2022 Gentoo Authors
215 +# Copyright 2022-2023 Gentoo Authors
216 # Distributed under the terms of the GNU General Public License v2
217
218 CHOST="mips64-gentoo-linux-musl"
219
220 diff --git a/profiles/default/linux/mips/17.0/n64/musl/parent b/profiles/default/linux/mips/17.0/n64/musl/parent
221 new file mode 100644
222 index 000000000000..bd0ef6ecac62
223 --- /dev/null
224 +++ b/profiles/default/linux/mips/17.0/n64/musl/parent
225 @@ -0,0 +1,3 @@
226 +..
227 +../../../../../../features/musl
228 +../../../../../../features/wd40
229
230 diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi b/profiles/default/linux/mips/17.0/o32/musl/eapi
231 similarity index 100%
232 rename from profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
233 rename to profiles/default/linux/mips/17.0/o32/musl/eapi
234
235 diff --git a/profiles/default/linux/mips/17.0/musl/o32/make.defaults b/profiles/default/linux/mips/17.0/o32/musl/make.defaults
236 similarity index 78%
237 rename from profiles/default/linux/mips/17.0/musl/o32/make.defaults
238 rename to profiles/default/linux/mips/17.0/o32/musl/make.defaults
239 index 4027a830450d..98209034fdbd 100644
240 --- a/profiles/default/linux/mips/17.0/musl/o32/make.defaults
241 +++ b/profiles/default/linux/mips/17.0/o32/musl/make.defaults
242 @@ -1,4 +1,4 @@
243 -# Copyright 2022 Gentoo Authors
244 +# Copyright 2022-2023 Gentoo Authors
245 # Distributed under the terms of the GNU General Public License v2
246
247 CHOST="mips-gentoo-linux-musl"
248
249 diff --git a/profiles/default/linux/mips/17.0/o32/musl/parent b/profiles/default/linux/mips/17.0/o32/musl/parent
250 new file mode 100644
251 index 000000000000..bd0ef6ecac62
252 --- /dev/null
253 +++ b/profiles/default/linux/mips/17.0/o32/musl/parent
254 @@ -0,0 +1,3 @@
255 +..
256 +../../../../../../features/musl
257 +../../../../../../features/wd40
258
259 diff --git a/profiles/default/linux/mips/17.0/musl/n64/eapi b/profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
260 similarity index 100%
261 rename from profiles/default/linux/mips/17.0/musl/n64/eapi
262 rename to profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
263
264 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
265 similarity index 54%
266 rename from profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
267 rename to profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
268 index 26dbb0e4c1dc..cb0c7807a72f 100644
269 --- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
270 +++ b/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
271 @@ -1,6 +1,9 @@
272 -# Copyright 2022 Gentoo Authors
273 +# Copyright 2022-2023 Gentoo Authors
274 # Distributed under the terms of the GNU General Public License v2
275
276 CHOST="mips64el-gentoo-linux-musl"
277 CHOST_n64="${CHOST}"
278 LIBDIR_n64="lib"
279 +
280 +# Disable sandbox because its currently broken on mipsel-musl
281 +FEATURES="-sandbox"
282
283 diff --git a/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent b/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
284 new file mode 100644
285 index 000000000000..a3de2bcf95f7
286 --- /dev/null
287 +++ b/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
288 @@ -0,0 +1,3 @@
289 +..
290 +../../../../../../../features/musl
291 +../../../../../../../features/wd40
292
293 diff --git a/profiles/default/linux/mips/17.0/musl/o32/eapi b/profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
294 similarity index 100%
295 rename from profiles/default/linux/mips/17.0/musl/o32/eapi
296 rename to profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
297
298 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults b/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
299 similarity index 57%
300 rename from profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
301 rename to profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
302 index 53daa27ad9fb..d19638d73590 100644
303 --- a/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
304 +++ b/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
305 @@ -1,5 +1,9 @@
306 -# Copyright 2022 Gentoo Authors
307 +# Copyright 2022-2023 Gentoo Authors
308 # Distributed under the terms of the GNU General Public License v2
309
310 +CHOST="mipsel-gentoo-linux-musl"
311 +CHOST_o32="${CHOST}"
312 +LIBDIR_o32="lib"
313 +
314 # Disable sandbox because its currently broken on mipsel-musl
315 FEATURES="-sandbox"
316
317 diff --git a/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent b/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
318 new file mode 100644
319 index 000000000000..a3de2bcf95f7
320 --- /dev/null
321 +++ b/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
322 @@ -0,0 +1,3 @@
323 +..
324 +../../../../../../../features/musl
325 +../../../../../../../features/wd40
326
327 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
328 deleted file mode 100644
329 index 7ed6ff82de6b..000000000000
330 --- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
331 +++ /dev/null
332 @@ -1 +0,0 @@
333 -5
334
335 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
336 deleted file mode 100644
337 index e92fcf7cbf75..000000000000
338 --- a/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
339 +++ /dev/null
340 @@ -1,2 +0,0 @@
341 -..
342 -../../../../../../../arch/mips/mipsel/mips64el/n64
343
344 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi b/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
345 deleted file mode 100644
346 index 7ed6ff82de6b..000000000000
347 --- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
348 +++ /dev/null
349 @@ -1 +0,0 @@
350 -5
351
352 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
353 deleted file mode 100644
354 index d0dec15ac7be..000000000000
355 --- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
356 +++ /dev/null
357 @@ -1,6 +0,0 @@
358 -# Copyright 2022 Gentoo Authors
359 -# Distributed under the terms of the GNU General Public License v2
360 -
361 -CHOST="mipsel-gentoo-linux-musl"
362 -CHOST_o32="${CHOST}"
363 -LIBDIR_o32="lib"
364
365 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
366 deleted file mode 100644
367 index 85db6caf16e5..000000000000
368 --- a/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
369 +++ /dev/null
370 @@ -1,2 +0,0 @@
371 -..
372 -../../../../../../../arch/mips/mipsel/o32
373
374 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/parent b/profiles/default/linux/mips/23.0/musl/mipsel/parent
375 deleted file mode 100644
376 index f2bcf2737c18..000000000000
377 --- a/profiles/default/linux/mips/23.0/musl/mipsel/parent
378 +++ /dev/null
379 @@ -1,2 +0,0 @@
380 -..
381 -../../../../../../arch/mips/mipsel
382
383 diff --git a/profiles/default/linux/mips/23.0/musl/n64/eapi b/profiles/default/linux/mips/23.0/musl/n64/eapi
384 deleted file mode 100644
385 index 7ed6ff82de6b..000000000000
386 --- a/profiles/default/linux/mips/23.0/musl/n64/eapi
387 +++ /dev/null
388 @@ -1 +0,0 @@
389 -5
390
391 diff --git a/profiles/default/linux/mips/23.0/musl/n64/parent b/profiles/default/linux/mips/23.0/musl/n64/parent
392 deleted file mode 100644
393 index 0a2e2f270682..000000000000
394 --- a/profiles/default/linux/mips/23.0/musl/n64/parent
395 +++ /dev/null
396 @@ -1,2 +0,0 @@
397 -..
398 -../../../../../../arch/mips/mips64/n64
399
400 diff --git a/profiles/default/linux/mips/23.0/musl/o32/eapi b/profiles/default/linux/mips/23.0/musl/o32/eapi
401 deleted file mode 100644
402 index 7ed6ff82de6b..000000000000
403 --- a/profiles/default/linux/mips/23.0/musl/o32/eapi
404 +++ /dev/null
405 @@ -1 +0,0 @@
406 -5
407
408 diff --git a/profiles/default/linux/mips/23.0/musl/o32/parent b/profiles/default/linux/mips/23.0/musl/o32/parent
409 deleted file mode 100644
410 index 6d4edaa24a38..000000000000
411 --- a/profiles/default/linux/mips/23.0/musl/o32/parent
412 +++ /dev/null
413 @@ -1,2 +0,0 @@
414 -..
415 -../../../../../../arch/mips/o32
416
417 diff --git a/profiles/default/linux/mips/23.0/musl/parent b/profiles/default/linux/mips/23.0/musl/parent
418 deleted file mode 100644
419 index 9ef7663a23b6..000000000000
420 --- a/profiles/default/linux/mips/23.0/musl/parent
421 +++ /dev/null
422 @@ -1,3 +0,0 @@
423 -..
424 -../../../../../features/musl
425 -../../../../../features/wd40
426
427 diff --git a/profiles/default/linux/mips/23.0/musl/eapi b/profiles/default/linux/mips/23.0/n64/musl/eapi
428 similarity index 100%
429 rename from profiles/default/linux/mips/23.0/musl/eapi
430 rename to profiles/default/linux/mips/23.0/n64/musl/eapi
431
432 diff --git a/profiles/default/linux/mips/17.0/musl/n64/make.defaults b/profiles/default/linux/mips/23.0/n64/musl/make.defaults
433 similarity index 78%
434 rename from profiles/default/linux/mips/17.0/musl/n64/make.defaults
435 rename to profiles/default/linux/mips/23.0/n64/musl/make.defaults
436 index 90dd88675350..594d429605ee 100644
437 --- a/profiles/default/linux/mips/17.0/musl/n64/make.defaults
438 +++ b/profiles/default/linux/mips/23.0/n64/musl/make.defaults
439 @@ -1,4 +1,4 @@
440 -# Copyright 2022 Gentoo Authors
441 +# Copyright 2022-2023 Gentoo Authors
442 # Distributed under the terms of the GNU General Public License v2
443
444 CHOST="mips64-gentoo-linux-musl"
445
446 diff --git a/profiles/default/linux/mips/23.0/n64/musl/parent b/profiles/default/linux/mips/23.0/n64/musl/parent
447 new file mode 100644
448 index 000000000000..bd0ef6ecac62
449 --- /dev/null
450 +++ b/profiles/default/linux/mips/23.0/n64/musl/parent
451 @@ -0,0 +1,3 @@
452 +..
453 +../../../../../../features/musl
454 +../../../../../../features/wd40
455
456 diff --git a/profiles/default/linux/mips/23.0/musl/mipsel/eapi b/profiles/default/linux/mips/23.0/o32/musl/eapi
457 similarity index 100%
458 rename from profiles/default/linux/mips/23.0/musl/mipsel/eapi
459 rename to profiles/default/linux/mips/23.0/o32/musl/eapi
460
461 diff --git a/profiles/default/linux/mips/23.0/musl/o32/make.defaults b/profiles/default/linux/mips/23.0/o32/musl/make.defaults
462 similarity index 78%
463 rename from profiles/default/linux/mips/23.0/musl/o32/make.defaults
464 rename to profiles/default/linux/mips/23.0/o32/musl/make.defaults
465 index 4027a830450d..98209034fdbd 100644
466 --- a/profiles/default/linux/mips/23.0/musl/o32/make.defaults
467 +++ b/profiles/default/linux/mips/23.0/o32/musl/make.defaults
468 @@ -1,4 +1,4 @@
469 -# Copyright 2022 Gentoo Authors
470 +# Copyright 2022-2023 Gentoo Authors
471 # Distributed under the terms of the GNU General Public License v2
472
473 CHOST="mips-gentoo-linux-musl"
474
475 diff --git a/profiles/default/linux/mips/23.0/o32/musl/parent b/profiles/default/linux/mips/23.0/o32/musl/parent
476 new file mode 100644
477 index 000000000000..bd0ef6ecac62
478 --- /dev/null
479 +++ b/profiles/default/linux/mips/23.0/o32/musl/parent
480 @@ -0,0 +1,3 @@
481 +..
482 +../../../../../../features/musl
483 +../../../../../../features/wd40
484
485 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
486 index 5845a27c356a..5907185b9e5a 100644
487 --- a/profiles/profiles.desc
488 +++ b/profiles/profiles.desc
489 @@ -351,10 +351,10 @@ arm64 default/linux/arm64/17.0/musl dev
490 arm64 default/linux/arm64/17.0/musl/llvm exp
491 arm64 default/linux/arm64/17.0/musl/hardened exp
492 arm64 default/linux/arm64/17.0/musl/hardened/selinux exp
493 -mips default/linux/mips/17.0/musl/o32 exp
494 -mips default/linux/mips/17.0/musl/n64 exp
495 -mips default/linux/mips/17.0/musl/mipsel/o32 exp
496 -mips default/linux/mips/17.0/musl/mipsel/n64 exp
497 +mips default/linux/mips/17.0/o32/musl exp
498 +mips default/linux/mips/17.0/n64/musl exp
499 +mips default/linux/mips/17.0/mipsel/o32/musl exp
500 +mips default/linux/mips/17.0/mipsel/n64/musl exp
501 riscv default/linux/riscv/20.0/rv64gc/lp64d/musl dev
502 riscv default/linux/riscv/20.0/rv64gc/lp64/musl dev
503 x86 default/linux/x86/17.0/musl dev