mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
0288415877
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@pm.me>
22 lines
660 B
Diff
22 lines
660 B
Diff
--- 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)\"
|