diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-10 11:22:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-10 11:45:19 +0000 |
| commit | 92465032c230ec01045b1952ddd8d4d8a2a9ab3a (patch) | |
| tree | 4f077a8b8bafdf16168b6a673ca716d0b8d10bed /main/gettext/disable-gettext-runtime-test-lock.patch | |
| parent | 309999be119ba2dd171a38e98ca8b6fa3c02b2d6 (diff) | |
| download | aports-92465032c230ec01045b1952ddd8d4d8a2a9ab3a.tar.bz2 aports-92465032c230ec01045b1952ddd8d4d8a2a9ab3a.tar.xz | |
main/gettext: fix testsuite with libunistring 0.9.10
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
Diffstat (limited to 'main/gettext/disable-gettext-runtime-test-lock.patch')
| -rw-r--r-- | main/gettext/disable-gettext-runtime-test-lock.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/main/gettext/disable-gettext-runtime-test-lock.patch b/main/gettext/disable-gettext-runtime-test-lock.patch new file mode 100644 index 0000000000..ec3a59b402 --- /dev/null +++ b/main/gettext/disable-gettext-runtime-test-lock.patch @@ -0,0 +1,47 @@ +commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb +Author: rpm-build <rpm-build> +AuthorDate: Wed Dec 21 12:50:54 2016 +0100 +Commit: rpm-build <rpm-build> +CommitDate: Wed Dec 21 12:52:36 2016 +0100 + + disable-gettext-runtime-test-lock.patch + +diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am +index 88a0684..3a27b79 100644 +--- a/gettext-runtime/tests/Makefile.am ++++ b/gettext-runtime/tests/Makefile.am +@@ -19,7 +19,7 @@ + AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects + EXTRA_DIST = + +-TESTS = test-lock ++TESTS = + + AM_CPPFLAGS = \ + -I.. \ +diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in +index 4327733..5879146 100644 +--- a/gettext-runtime/tests/Makefile.in ++++ b/gettext-runtime/tests/Makefile.in +@@ -86,7 +86,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-TESTS = test-lock$(EXEEXT) ++TESTS = + check_PROGRAMS = test-lock$(EXEEXT) + subdir = tests + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in +index 26becd9..4b9d0e4 100644 +--- a/gettext-tools/gnulib-tests/Makefile.in ++++ b/gettext-tools/gnulib-tests/Makefile.in +@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \ + test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \ + test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \ + test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \ +- test-localename$(EXEEXT) test-lock$(EXEEXT) \ ++ test-localename$(EXEEXT) \ + test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \ + test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \ + test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \ |