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/base/, profiles/features/musl/
Date: Sat, 10 Sep 2022 13:48:43
Message-Id: 1662817711.e617820e9eba576c0546c2a756a1b564370aa43b.sam@gentoo
1 commit: e617820e9eba576c0546c2a756a1b564370aa43b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 10 13:31:48 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 10 13:48:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e617820e
7
8 profiles: mask/unmask musl on musl/non musl profiles
9
10 Closes: https://bugs.gentoo.org/869515
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12 Closes: https://github.com/gentoo/gentoo/pull/27199
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 profiles/base/package.mask | 6 +++++-
16 profiles/features/musl/package.mask | 1 +
17 2 files changed, 6 insertions(+), 1 deletion(-)
18
19 diff --git a/profiles/base/package.mask b/profiles/base/package.mask
20 index 58f5f5ac5739..4d33927de983 100644
21 --- a/profiles/base/package.mask
22 +++ b/profiles/base/package.mask
23 @@ -1,6 +1,10 @@
24 -# Copyright 1999-2021 Gentoo Authors
25 +# Copyright 1999-2022 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 +# Sam James <sam@g.o> (2022-09-10)
29 +# Mask in general and unmask on specific profiles
30 +sys-libs/musl
31 +
32 # Sam James <sam@g.o> (2021-11-22)
33 # Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease
34 # dependency resolution. In a fair number of cases, this has helped
35
36 diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
37 index 52e3d47eb93c..ae834bd2698b 100644
38 --- a/profiles/features/musl/package.mask
39 +++ b/profiles/features/musl/package.mask
40 @@ -287,6 +287,7 @@ app-emulation/dosemu
41 # Old undated blocks of masks
42 #
43 sys-libs/glibc
44 +-sys-libs/musl
45
46 # As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo
47 # to work on musl, so no need to mask udev.