summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-10-23 08:57:22 +0100
committerSam James <sam@gentoo.org>2023-10-23 08:57:22 +0100
commit6cbe3a8909b5b8842a69d4ac426c12a77cced2d3 (patch)
treea9d74b79b4af739740903c38778f1577059e24d6 /dev-util
parentdev-java/apache-rat: Stabilize 0.15 amd64, #916148 (diff)
downloadgentoo-6cbe3a8909b5b8842a69d4ac426c12a77cced2d3.tar.gz
gentoo-6cbe3a8909b5b8842a69d4ac426c12a77cced2d3.tar.bz2
gentoo-6cbe3a8909b5b8842a69d4ac426c12a77cced2d3.zip
dev-util/gperf: backport parallel tests fix
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/gperf/files/gperf-3.1-parallel-tests.patch29
-rw-r--r--dev-util/gperf/gperf-3.1-r1.ebuild1
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-util/gperf/files/gperf-3.1-parallel-tests.patch b/dev-util/gperf/files/gperf-3.1-parallel-tests.patch
new file mode 100644
index 000000000000..13495a15c2a5
--- /dev/null
+++ b/dev-util/gperf/files/gperf-3.1-parallel-tests.patch
@@ -0,0 +1,29 @@
+https://savannah.gnu.org/bugs/?53208
+https://git.savannah.gnu.org/cgit/gperf.git/commit/?id=11487a61ce8a90f29c078dffc576e42cad24b789
+
+From 11487a61ce8a90f29c078dffc576e42cad24b789 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sat, 8 Sep 2018 17:12:15 +0200
+Subject: Fix failure of "make check -j2".
+
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -1,6 +1,6 @@
+ # Makefile for gperf/tests
+
+-# Copyright (C) 1989, 1992-1993, 1995, 1998, 2000, 2002-2004, 2007-2009, 2012, 2016 Free Software Foundation, Inc.
++# Copyright (C) 1989, 1992-1993, 1995, 1998, 2000, 2002-2004, 2007-2009, 2012, 2016, 2018 Free Software Foundation, Inc.
+ # Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
+ # and Bruno Haible <bruno@clisp.org>.
+ #
+@@ -138,7 +138,7 @@ check-smtp:
+
+ # these next 5 are demos that show off the generated code
+ POSTPROCESS_FOR_MINGW = LC_ALL=C tr -d '\r' | LC_ALL=C sed -e 's|[^ ]*[/\\][\\]*src[/\\][\\]*gperf[^ ]*|../src/gperf|'
+-check-test:
++check-test: check-ada
+ $(GPERF) -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,'$$' < $(srcdir)/c-parse.gperf | $(POSTPROCESS_FOR_MINGW) > c-parse.out
+ diff $(srcdir)/c-parse.exp c-parse.out
+ $(GPERF) -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,'$$' < $(srcdir)/objc.gperf | $(POSTPROCESS_FOR_MINGW) > objc.out
+--
+cgit v1.1
diff --git a/dev-util/gperf/gperf-3.1-r1.ebuild b/dev-util/gperf/gperf-3.1-r1.ebuild
index b38d7b462b36..2d775e7d9762 100644
--- a/dev-util/gperf/gperf-3.1-r1.ebuild
+++ b/dev-util/gperf/gperf-3.1-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
PATCHES=(
"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
"${FILESDIR}"/${P}-clang-16-wregister.patch
+ "${FILESDIR}"/${P}-parallel-tests.patch
)
src_prepare() {