[gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/

["David Seifert" <soap@gentoo.org>]

commit:     7b4388cc6898865367e9ae91385449313c5dfb96
Author:     Yifeng Li <tomli <AT> tomli <DOT> me>
AuthorDate: Sun Feb 19 19:21:17 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <AT> tomli.me>
Signed-off-by: David Seifert <soap <AT> 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() {