diff options
Diffstat (limited to 'sys-devel/gettext/files')
| -rw-r--r-- | sys-devel/gettext/files/gettext-0.21-musl-omit_setlocale_lock.patch | 37 | ||||
| -rw-r--r-- | sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch | 100 |
2 files changed, 137 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 + diff --git a/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch new file mode 100644 index 000000000000..a7471ac724c9 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch @@ -0,0 +1,100 @@ +From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Tue, 11 Oct 2022 01:54:44 +0200 +Subject: [PATCH] Avoid warnings during configure execution with + --disable-java. + +Reported by Sam James <sam@cmpct.info> +in <https://savannah.gnu.org/bugs/?63193>. + +* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline. +* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and +gt_JAVACOMP_DISABLED inline. +--- a/gettext-runtime/configure.ac ++++ b/gettext-runtime/configure.ac +@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVA= ++ HAVE_JAVA_ENVVAR= ++ HAVE_GIJ= ++ HAVE_JAVA= ++ HAVE_JRE= ++ HAVE_JVIEW= ++ AC_SUBST([CONF_JAVA]) ++ AC_SUBST([HAVE_JAVA_ENVVAR]) ++ AC_SUBST([HAVE_GIJ]) ++ AC_SUBST([HAVE_JAVA]) ++ AC_SUBST([HAVE_JRE]) ++ AC_SUBST([HAVE_JVIEW]) ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index 5e2d593..cf579ff 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -7070,7 +7070,11 @@ fi + + else $as_nop + +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index f897bc3..3af54cd 100755 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -8718,8 +8718,11 @@ fi + + else $as_nop + +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + |