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/features/musl/
Date: Thu, 14 Oct 2021 17:16:38
Message-Id: 1634231769.acc828b30f673d695cae4bb4010b4c0402a1e104.sam@gentoo
1 commit: acc828b30f673d695cae4bb4010b4c0402a1e104
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 14 17:15:51 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 14 17:16:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc828b3
7
8 profiles/features/musl: use full path in INSTALL_MASK for locale.alias
9
10 We want to allow e.g. /usr/share/X11/locale/locale.alias to be installed.
11
12 Closes: https://bugs.gentoo.org/799437
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 profiles/features/musl/make.defaults | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
17
18 diff --git a/profiles/features/musl/make.defaults b/profiles/features/musl/make.defaults
19 index a55eb81dd10..80a8fdf9240 100644
20 --- a/profiles/features/musl/make.defaults
21 +++ b/profiles/features/musl/make.defaults
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 PORTAGE_LIBC="musl"
28 @@ -15,4 +15,5 @@ FEATURES="-multilib-strict"
29
30 # TODO: fix so musl doesn't generate this for all packages
31 # that use a charset, it causes package collisons.
32 -INSTALL_MASK="charset.alias locale.alias"
33 +# Note: we use a full path for locale.alias for bug #799437
34 +INSTALL_MASK="charset.alias /usr/share/locale/locale.alias"