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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D21D515800F for ; Sun, 19 Feb 2023 19:21:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1852FE0967; Sun, 19 Feb 2023 19:21:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EEC91E0967 for ; Sun, 19 Feb 2023 19:21:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB25E33BDFC for ; Sun, 19 Feb 2023 19:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CDBC8AA for ; Sun, 19 Feb 2023 19:21:33 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1676834477.7b4388cc6898865367e9ae91385449313c5dfb96.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gettext/gettext-0.21.1.ebuild X-VCS-Directories: sys-devel/gettext/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7b4388cc6898865367e9ae91385449313c5dfb96 X-VCS-Branch: master Date: Sun, 19 Feb 2023 19:21:33 +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: cdee8f17-da98-4ef7-b8a5-f79515deffd1 X-Archives-Hash: f6f7e828b76845762dceffd6f0185da1 commit: 7b4388cc6898865367e9ae91385449313c5dfb96 Author: Yifeng Li tomli me> AuthorDate: Sun Feb 19 19:21:17 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Feb 19 19:21:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4388cc sys-devel/gettext: fix macOS bootstrap build. When bootstrapping Gentoo Prefix on macOS 13.2 (Ventura) on an Apple M1 system, it will fail at stage3 (note that there are other bugs that prevent the bootstrapping from reach stage3, which must also be resolved) due to the following build failure in sys-devel/gettext-0.21.1: Undefined symbols for architecture arm64: "_gl_get_setlocale_null_lock", referenced from: _libgettextpo_setlocale_null_r in libgnu.a(setlocale_null.o) _libgettextpo_setlocale_null in libgnu.a(setlocale_null.o) ld: symbol(s) not found for architecture arm64 A quick search of the symbol "_gl_get_setlocale_null_lock" revealed that the bug is actually already known - GNU gettext bug 62659 [1]. It failed to find the symbol because GNU's libintl was not present during the bootstrap stage (though it would be installed later), and due to the hardcoded OMIT_SETLOCALE_LOCK value, GNU gettext still attempts to use SETLOCALE_LOCK. Currently the Portage tree already contains a patch for musl. The simplest fix is just applying the same patch to Darwin as well. [1] https://savannah.gnu.org/bugs/?62659 Closes: https://github.com/gentoo/gentoo/pull/29655 Closes: https://bugs.gentoo.org/895330 Signed-off-by: Yifeng Li tomli.me> Signed-off-by: David Seifert gentoo.org> sys-devel/gettext/gettext-0.21.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild index 7b9266695787..e7f594906b2e 100644 --- a/sys-devel/gettext/gettext-0.21.1.ebuild +++ b/sys-devel/gettext/gettext-0.21.1.ebuild @@ -92,7 +92,9 @@ src_prepare() { elibtoolize - use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + if use elibc_musl || use elibc_Darwin; then + eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + fi } multilib_src_configure() {