summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2020-10-21 00:10:40 +0200
committerAvatar Marvin Schmidt <marvin.schmidt1987@gmail.com> 2020-10-21 10:15:50 +0000
commitb3e91acb1cc31ae41308f3fe3e8c493fb0e89a96 (patch)
treee388cf243a0c78fa91dcd6629f258708dbbc390a
parent1e77ebb91132719eb69b2aa6fe809459688ca858 (diff)
downloadarbor-b3e91acb1cc31ae41308f3fe3e8c493fb0e89a96.tar.gz
arbor-b3e91acb1cc31ae41308f3fe3e8c493fb0e89a96.tar.xz
gettext: Backport patch to fix tests on armv7
The tests failed in our armv7 stage build: [snip] PASS: test-open PASS: test-perror.sh FAIL: test-perror2 ../../build-aux/test-driver: line 107: 1801313 Aborted (core dumped) "$@" > $log_file 2>&1 PASS: test-pipe-filter-ii1.sh PASS: test-pipe [snip] PASS: test-strchrnul PASS: test-strerror FAIL: test-strerror_r PASS: test-striconv ../../build-aux/test-driver: line 107: 1803263 Aborted (core dumped) "$@" > $log_file 2>&1 PASS: test-striconveh [snip] ============================================================================ Testsuite summary for gettext-tools 0.21 ============================================================================ ============================================================================ See gnulib-tests/test-suite.log Please report to bug-gettext@gnu.org ============================================================================
-rw-r--r--packages/sys-devel/gettext/files/0001-perror-strerror_r-remove-unportable-tests.patch47
-rw-r--r--packages/sys-devel/gettext/gettext-0.21-r1.exheres-08
2 files changed, 55 insertions, 0 deletions
diff --git a/packages/sys-devel/gettext/files/0001-perror-strerror_r-remove-unportable-tests.patch b/packages/sys-devel/gettext/files/0001-perror-strerror_r-remove-unportable-tests.patch
new file mode 100644
index 000000000..5c182d4eb
--- /dev/null
+++ b/packages/sys-devel/gettext/files/0001-perror-strerror_r-remove-unportable-tests.patch
@@ -0,0 +1,47 @@
+Upstream: Yes, backported
+
+From 3cf6fe89ae2dca2f0f1bf3e3bba47717e43d7311 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 27 Aug 2020 17:52:58 -0700
+Subject: [PATCH] perror, strerror_r: remove unportable tests
+
+Problem reported by Florian Weimer in:
+https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
+* tests/test-perror2.c (main):
+* tests/test-strerror_r.c (main): Omit unportable tests.
+---
+ tests/test-perror2.c | 3 ---
+ tests/test-strerror_r.c | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/tests/test-perror2.c b/tests/test-perror2.c
+index 1d14eda7b..c6214dd25 100644
+--- a/tests/test-perror2.c
++++ b/tests/test-perror2.c
+@@ -79,9 +79,6 @@ main (void)
+ errno = -5;
+ perror ("");
+ ASSERT (!ferror (stderr));
+- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
+- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
+- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
+ ASSERT (STREQ (msg4, str4));
+
+ free (str1);
+diff --git a/tests/test-strerror_r.c b/tests/test-strerror_r.c
+index b11d6fd9f..c1dbcf837 100644
+--- a/tests/test-strerror_r.c
++++ b/tests/test-strerror_r.c
+@@ -165,9 +165,6 @@ main (void)
+
+ strerror_r (EACCES, buf, sizeof buf);
+ strerror_r (-5, buf, sizeof buf);
+- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
+- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
+- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
+ ASSERT (STREQ (msg4, str4));
+
+ free (str1);
+--
+2.28.0
+
diff --git a/packages/sys-devel/gettext/gettext-0.21-r1.exheres-0 b/packages/sys-devel/gettext/gettext-0.21-r1.exheres-0
index 100b01268..7c89e3487 100644
--- a/packages/sys-devel/gettext/gettext-0.21-r1.exheres-0
+++ b/packages/sys-devel/gettext/gettext-0.21-r1.exheres-0
@@ -26,6 +26,14 @@ DEPENDENCIES="
openmp? ( sys-libs/libgomp:= )
"
+src_prepare() {
+ default
+
+ edo pushd gettext-tools/gnulib-tests
+ expatch -p2 "${FILES}"/0001-perror-strerror_r-remove-unportable-tests.patch
+ edo popd
+}
+
src_configure() {
econf \
--htmldir=/usr/share/doc/${PNVR}/html \