From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39C3F158086 for ; Thu, 14 Oct 2021 17:16:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78A4FE0826; Thu, 14 Oct 2021 17:16:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C943E0826 for ; Thu, 14 Oct 2021 17:16:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9402F342EB7 for ; Thu, 14 Oct 2021 17:16:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D1D2D0 for ; Thu, 14 Oct 2021 17:16:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634231769.acc828b30f673d695cae4bb4010b4c0402a1e104.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/features/musl/make.defaults X-VCS-Directories: profiles/features/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: acc828b30f673d695cae4bb4010b4c0402a1e104 X-VCS-Branch: master Date: Thu, 14 Oct 2021 17:16:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56373b39-ba3b-4286-ae44-43e9b78c88f8 X-Archives-Hash: d1b11b0906e8995e98e71fd109d4cb67 commit: acc828b30f673d695cae4bb4010b4c0402a1e104 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 17:15:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 14 17:16:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc828b3 profiles/features/musl: use full path in INSTALL_MASK for locale.alias We want to allow e.g. /usr/share/X11/locale/locale.alias to be installed. Closes: https://bugs.gentoo.org/799437 Signed-off-by: Sam James gentoo.org> profiles/features/musl/make.defaults | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/profiles/features/musl/make.defaults b/profiles/features/musl/make.defaults index a55eb81dd10..80a8fdf9240 100644 --- a/profiles/features/musl/make.defaults +++ b/profiles/features/musl/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 PORTAGE_LIBC="musl" @@ -15,4 +15,5 @@ FEATURES="-multilib-strict" # TODO: fix so musl doesn't generate this for all packages # that use a charset, it causes package collisons. -INSTALL_MASK="charset.alias locale.alias" +# Note: we use a full path for locale.alias for bug #799437 +INSTALL_MASK="charset.alias /usr/share/locale/locale.alias"