sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-20 18:59:05 +00:00
parent b9b894d937
commit 4cc27cb2e4
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
264 changed files with 725 additions and 901 deletions

View file

@ -1,22 +1,10 @@
Provide unprefixed symbols, e.g. libintl_dgettext -> dgettext
https://savannah.gnu.org/bugs/index.php?64323
Fix build failure with "make -j"
https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15
Index: gettext-runtime/intl/Makefile.in
--- gettext-runtime/intl/Makefile.in.orig
+++ gettext-runtime/intl/Makefile.in
@@ -1692,7 +1692,7 @@ SUFFIXES =
AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
-DLOCALEDIR=$(localedir_c_make) \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \
- -DBUILDING_LIBINTL $(am__append_1)
+ -DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1)
# Enable more warning options in this directory.
@@ -2601,8 +2601,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h
@@ -2606,8 +2606,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h
ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
plural-exp.lo: ../config.h $(srcdir)/plural-exp.h

View file

@ -4,7 +4,7 @@ https://savannah.gnu.org/bugs/index.php?64536
Index: gettext-runtime/intl/configure
--- gettext-runtime/intl/configure.orig
+++ gettext-runtime/intl/configure
@@ -6695,7 +6695,7 @@ fi
@@ -6698,7 +6698,7 @@ fi

View file

@ -6,16 +6,16 @@ This was also a race if MAKE_JOBS > 1.
Index: gettext-tools/gnulib-lib/Makefile.in
--- gettext-tools/gnulib-lib/Makefile.in.orig
+++ gettext-tools/gnulib-lib/Makefile.in
@@ -4390,7 +4390,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
$(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(MBRTOWC_LIB) \
$(POSIX_SPAWN_LIB) $(POW_LIBM) $(QCOPY_ACL_LIB) $(SERVENT_LIB) \
$(SETLOCALE_LIB) $(SETLOCALE_NULL_LIB) @INTL_MACOSX_LIBS@ \
- -release @VERSION@ $(am__append_36) $(am__append_50) \
+ $(am__append_36) $(am__append_50) \
$(am__append_150) $(am__append_151)
@@ -4600,7 +4600,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
$(LTLIBC32CONV) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) \
$(MBRTOWC_LIB) $(POSIX_SPAWN_LIB) $(POW_LIBM) $(QCOPY_ACL_LIB) \
$(SERVENT_LIB) $(SETLOCALE_LIB) $(SETLOCALE_NULL_LIB) \
- @INTL_MACOSX_LIBS@ -release @VERSION@ $(am__append_36) \
+ @INTL_MACOSX_LIBS@ $(am__append_36) \
$(am__append_52) $(am__append_171) $(am__append_172)
# Use this preprocessor expression to decide whether #include_next works.
@@ -6539,7 +6539,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX
@@ -6899,7 +6899,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CX
@GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@
# No need to install libgettextlib.a, except on AIX.

View file

@ -6,7 +6,7 @@ This was also a race if MAKE_JOBS > 1.
Index: gettext-tools/src/Makefile.in
--- gettext-tools/src/Makefile.in.orig
+++ gettext-tools/src/Makefile.in
@@ -3819,7 +3819,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
@@ -3923,7 +3923,7 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
# Need @LTLIBINTL@ because many source files use gettext().
# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
# use iconv().
@ -15,7 +15,7 @@ Index: gettext-tools/src/Makefile.in
../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) \
$(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined \
$(am__append_3) $(am__append_5) $(am__append_7)
@@ -5281,7 +5281,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
@@ -5385,7 +5385,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIB
@USE_INSTALLED_LIBTEXTSTYLE_FALSE@ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
# No need to install libgettextsrc.a, except on AIX.