* [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/arm/23.0/armv6j_hf/musl/, ...
@ 2024-06-02 0:45 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2024-06-02 0:45 UTC (permalink / raw
To: gentoo-commits
commit: 0c00e66b06dd67d657b4e039db5a2a7d779bba03
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon May 20 15:03:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 00:43:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c00e66b
profiles/default/linux: move sanitize mask from use.stable.mask to use.mask
Better workaround until this is fully solved.
Bug: https://bugs.gentoo.org/920630
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36751
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../armv6j_hf/musl/{package.use.stable.mask => package.use.mask} | 0
.../armv7a_hf/musl/{package.use.stable.mask => package.use.mask} | 0
.../armv6j_hf/musl/{package.use.stable.mask => package.use.mask} | 0
.../armv7a_hf/musl/{package.use.stable.mask => package.use.mask} | 0
profiles/default/linux/x86/23.0/i486/musl/package.use.mask | 7 ++++++-
profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask | 6 ------
.../default/linux/x86/23.0/i486/split-usr/musl/package.use.mask | 6 +++++-
.../linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask | 6 ------
profiles/default/linux/x86/23.0/i686/musl/package.use.mask | 6 +++++-
profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask | 6 ------
.../default/linux/x86/23.0/i686/split-usr/musl/package.use.mask | 6 +++++-
.../linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask | 6 ------
12 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.stable.mask
rename to profiles/default/linux/arm/23.0/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.stable.mask
rename to profiles/default/linux/arm/23.0/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.stable.mask
rename to profiles/default/linux/arm/23.0/split-usr/armv6j_hf/musl/package.use.mask
diff --git a/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.stable.mask
rename to profiles/default/linux/arm/23.0/split-usr/armv7a_hf/musl/package.use.mask
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
index b794980bdad7..3ced25c30235 100644
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
@@ -1,8 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
# The patch added for 5.39-r1 breaks on musl i686
# file-5.39-seccomp_sandbox.patch is okay
# file-5.39-portage_sandbox.patch is broken
sys-apps/file seccomp
+
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
# The patch added for 5.39-r1 breaks on musl i686
# file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
# The patch added for 5.39-r1 breaks on musl i686
# file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
index b794980bdad7..d3fa26567c1d 100644
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Ian Jordan <immoloism@gmail.com> (2024-05-20)
+# Does not compile with musl-1.2.4+
+sys-devel/gcc sanitize
+
# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
# The patch added for 5.39-r1 breaks on musl i686
# file-5.39-seccomp_sandbox.patch is okay
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
deleted file mode 100644
index c021f45d8508..000000000000
--- a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License, v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-20)
-# Does not compile with musl-1.2.4
-sys-devel/gcc sanitize
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-06-02 0:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-02 0:45 [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/arm/23.0/armv6j_hf/musl/, Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox