mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-19 23:51:58 +01:00
92465032c2
gettext bundles libunistring and parts of it, data tables, gets built and included even when external libunistring is used. The newer external libunistring (0.9.10) ends up use the data table from the older version of the bundled libunistring and things goes horribly wrong. We work around this by exclude unilbrk from the build so we only use external libunistring. Upstream bug reports: https://lists.gnu.org/archive/html/bug-gettext/2018-08/msg00008.html https://savannah.gnu.org/bugs/index.php?54453
53 lines
2.9 KiB
Diff
53 lines
2.9 KiB
Diff
diff --git a/gettext-tools/gnulib-lib/Makefile.in b/gettext-tools/gnulib-lib/Makefile.in
|
|
index a8e89eb..4fc24d7 100644
|
|
--- a/gettext-tools/gnulib-lib/Makefile.in
|
|
+++ b/gettext-tools/gnulib-lib/Makefile.in
|
|
@@ -593,8 +593,8 @@ am_libgettextlib_la_OBJECTS = copy-acl.lo set-acl.lo \
|
|
striconveha.lo strnlen1.lo styled-ostream.lo tempname.lo \
|
|
term-ostream.lo $(am__objects_4) $(am__objects_5) \
|
|
glthread/threadlib.lo glthread/tls.lo tmpdir.lo trim.lo \
|
|
- $(am__objects_6) $(am__objects_7) unilbrk/lbrktables.lo \
|
|
- $(am__objects_8) $(am__objects_9) unilbrk/ulc-common.lo \
|
|
+ $(am__objects_6) $(am__objects_7) \
|
|
+ $(am__objects_8) $(am__objects_9) \
|
|
$(am__objects_10) $(am__objects_11) unistd.lo dup-safer.lo \
|
|
fd-safer.lo pipe-safer.lo $(am__objects_12) $(am__objects_13) \
|
|
$(am__objects_14) $(am__objects_15) $(am__objects_16) \
|
|
@@ -2400,8 +2400,8 @@ libgettextlib_la_SOURCES = copy-acl.c set-acl.c acl-errno-valid.c \
|
|
tempname.c term-ostream.c $(am__append_19) $(am__append_20) \
|
|
glthread/threadlib.c glthread/tls.h glthread/tls.c tmpdir.h \
|
|
tmpdir.c trim.c $(am__append_21) $(am__append_22) \
|
|
- unilbrk/lbrktables.c $(am__append_23) $(am__append_24) \
|
|
- unilbrk/ulc-common.c $(am__append_25) $(am__append_26) \
|
|
+ $(am__append_23) $(am__append_24) \
|
|
+ $(am__append_25) $(am__append_26) \
|
|
unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_27) \
|
|
$(am__append_28) $(am__append_29) $(am__append_30) \
|
|
$(am__append_31) $(am__append_32) $(am__append_33) \
|
|
diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in
|
|
index 5f9550d..bd684cb 100644
|
|
--- a/gettext-tools/libgettextpo/Makefile.in
|
|
+++ b/gettext-tools/libgettextpo/Makefile.in
|
|
@@ -554,8 +554,8 @@ am_libgnu_la_OBJECTS = basename.lo c-ctype.lo c-strcasecmp.lo \
|
|
malloca.lo markup.lo mbswidth.lo ostream.lo progname.lo \
|
|
striconv.lo striconveh.lo striconveha.lo glthread/threadlib.lo \
|
|
glthread/tls.lo $(am__objects_3) $(am__objects_4) \
|
|
- $(am__objects_5) unilbrk/lbrktables.lo $(am__objects_6) \
|
|
- $(am__objects_7) unilbrk/ulc-common.lo $(am__objects_8) \
|
|
+ $(am__objects_5) $(am__objects_6) \
|
|
+ $(am__objects_7) $(am__objects_8) \
|
|
unistd.lo $(am__objects_9) $(am__objects_10) $(am__objects_11) \
|
|
$(am__objects_12) $(am__objects_13) $(am__objects_14) \
|
|
$(am__objects_15) $(am__objects_16) $(am__objects_17) \
|
|
@@ -2179,8 +2179,8 @@ libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \
|
|
striconv.c striconveh.h striconveh.c striconveha.h \
|
|
striconveha.c glthread/threadlib.c glthread/tls.h \
|
|
glthread/tls.c $(am__append_6) $(am__append_7) $(am__append_8) \
|
|
- unilbrk/lbrktables.c $(am__append_9) $(am__append_10) \
|
|
- unilbrk/ulc-common.c $(am__append_11) unistd.c \
|
|
+ $(am__append_9) $(am__append_10) \
|
|
+ $(am__append_11) unistd.c \
|
|
$(am__append_12) $(am__append_13) $(am__append_14) \
|
|
$(am__append_15) $(am__append_16) $(am__append_17) \
|
|
$(am__append_18) $(am__append_19) $(am__append_20) \
|