diff options
| author |   Alfred Persson Forsberg <cat@catcream.org> | 2022-08-29 22:02:29 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-09-01 03:13:16 +0100 |
| commit | 45a9cd813a2244a676ab9a651a5274baac83a9d0 (patch) | |
| tree | 1e7b965c42cfee8d5c7ccd44b1e24d213818b353 /sys-devel/gettext/files | |
| parent | dev-libs/ppl: update EAPI 7 -> 8, remove redundant docs (diff) | |
| download | gentoo-45a9cd813a2244a676ab9a651a5274baac83a9d0.tar.gz gentoo-45a9cd813a2244a676ab9a651a5274baac83a9d0.tar.bz2 gentoo-45a9cd813a2244a676ab9a651a5274baac83a9d0.zip | |
sys-devel/gettext: fix musl symbol
This patch forces OMIT_SETLOCALE_LOCK to 0 so that
gl_get_setlocale_null_lock gets defined.
Deliberately gone for a conditional patch
for now as we want to get this sorted
properly but it involves discussion
with upstream first on the best way forward.
See: https://savannah.gnu.org/bugs/index.php?62659
Closes: https://bugs.gentoo.org/830590
Signed-off-by: Alfred Persson Forsberg <cat@catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/27062
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel/gettext/files')
| -rw-r--r-- | sys-devel/gettext/files/gettext-0.21-musl-omit_setlocale_lock.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/sys-devel/gettext/files/gettext-0.21-musl-omit_setlocale_lock.patch b/sys-devel/gettext/files/gettext-0.21-musl-omit_setlocale_lock.patch new file mode 100644 index 000000000000..e063785376dc --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.21-musl-omit_setlocale_lock.patch @@ -0,0 +1,37 @@ +OMIT_SETLOCALE_LOCK should be true when gl_get_setlocale_null_lock is provided by a dependency library, like GNU libintl. +On Gentoo musl we use musl's libintl and gl_get_setlocale_null_lock is not provided by it, therefore we set OMIT_SETLOCALE_LOCK to 0. + +To properly fix this we should do AC_SEARCH_LIBS([gl_get_setlocale_null_lock], [intl], ...) in automake, but instead we do this +hack to not get complacent. This should be fixed upstream. + +https://savannah.gnu.org/bugs/index.php?62659#comment7 +https://bugs.gentoo.org/830590 +diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am +index 59b016e..d92978d 100644 +--- a/gettext-tools/libgettextpo/Makefile.am ++++ b/gettext-tools/libgettextpo/Makefile.am +@@ -40,7 +40,7 @@ AM_CPPFLAGS = \ + -I../src -I$(top_srcdir)/src \ + -I../intl -I$(top_srcdir)/../gettext-runtime/intl + +-DEFS = -DIN_LIBGETTEXTPO=1 -DOMIT_SETLOCALE_LOCK=1 @DEFS@ ++DEFS = -DIN_LIBGETTEXTPO=1 -DOMIT_SETLOCALE_LOCK=0 @DEFS@ + + # libgettextpo contains the public API for PO files. + libgettextpo_la_SOURCES = \ +diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in +index f76efa5..aca3a81 100644 +--- a/gettext-tools/libgettextpo/Makefile.in ++++ b/gettext-tools/libgettextpo/Makefile.in +@@ -804,7 +804,7 @@ CXXDEPMODE = @CXXDEPMODE@ + CXXFLAGS = @CXXFLAGS@ + CXX_CHOICE = @CXX_CHOICE@ + CYGPATH_W = @CYGPATH_W@ +-DEFS = -DIN_LIBGETTEXTPO=1 -DOMIT_SETLOCALE_LOCK=1 @DEFS@ ++DEFS = -DIN_LIBGETTEXTPO=1 -DOMIT_SETLOCALE_LOCK=0 @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ +-- +2.35.1 + |