[openwrt/openwrt] gettext-full: add missing link to libunistring

LEDE Commits lede-commits at lists.infradead.org
Mon May 15 07:14:57 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/02884158771b0ec945c7cdfaf83d13841324d666

commit 02884158771b0ec945c7cdfaf83d13841324d666
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Sat May 13 18:55:44 2023 -0400

    gettext-full: add missing link to libunistring
    
    Running autoreconf or autogen.sh is causing
    the gettext-runtime subdirectory to have a configure script
    that looks for and attempts to link to an external libunistring.
    However, the macros and symbols for supporting that configuration
    are not present in this subdirectory yet.
    
    This results in some host machines to not build the
    included libunistring objects for libgrt,
    but at the same time, also not input the proper flag to the linker
    for linking to an external library when it is found or even when
    explicitly setting configuration to use a prefix for libunistring,
    resulting in the common linking failure "undefined reference".
    
    Some similar (and old...) upstream commits do the same thing,
    but only for gettext-tools and libgettextpo.
    
    Ref: ae943bcc1 ("Link with libunistring, if it exists.") # gettext.git
    Ref: 61e21a72f ("Avoid link error in programs that use libgettextpo.") # gettext.git
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 .../patches/200-libunistring-missing-link.patch     | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/package/libs/gettext-full/patches/200-libunistring-missing-link.patch b/package/libs/gettext-full/patches/200-libunistring-missing-link.patch
new file mode 100644
index 0000000000..2e1dbf84e8
--- /dev/null
+++ b/package/libs/gettext-full/patches/200-libunistring-missing-link.patch
@@ -0,0 +1,21 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -78,6 +78,7 @@ if ! $skip_gnulib; then
+     getopt-gnu
+     gettext-h
+     havelib
++    libunistring-optional
+     memmove
+     noreturn
+     progname
+--- a/gettext-runtime/src/Makefile.am
++++ b/gettext-runtime/src/Makefile.am
+@@ -40,7 +40,7 @@ envsubst_SOURCES = envsubst.c
+ 
+ # Link dependencies.
+ # Need @LTLIBICONV@ because striconv.c uses iconv().
+-LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@ $(WOE32_LDADD)
++LDADD = ../gnulib-lib/libgrt.a $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ $(WOE32_LDADD)
+ 
+ # Specify installation directory, for --enable-relocatable.
+ gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"




More information about the lede-commits mailing list