summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2020-04-07 14:37:02 -0700
committerPatrick McLean <chutzpah@gentoo.org>2020-04-07 14:37:19 -0700
commit0d207f6f90bfed5e7128ee6502806476023a5c5e (patch)
treed489d8a4e5cb47cb1b0ea87d98c0ca7dc46d7af4 /net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch
parentapp-admin/haskell-updater: drop on sparc, haskell is gone (diff)
downloadgentoo-0d207f6f90bfed5e7128ee6502806476023a5c5e.tar.gz
gentoo-0d207f6f90bfed5e7128ee6502806476023a5c5e.tar.bz2
gentoo-0d207f6f90bfed5e7128ee6502806476023a5c5e.zip
net-firewall/nftables-0.9.4-r2: revbump, cleanup deps, provide man pages
It turns out that flex and bison aren't actually needed to build, but there was a bug in the build system that made it abort if they weren't available. Add a patch to fix this bug, and remove the extra deps. Disable USE=doc by default and provide pre-built man pages in a separate tarball. Script to build them is at man-pages/gen-manpages.bash Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch')
-rw-r--r--net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch b/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch
new file mode 100644
index 000000000000..6eb708596255
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch
@@ -0,0 +1,37 @@
+From 3c83e2bca90b697e7c98f849319f1ad015dcdb86 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 7 Apr 2020 13:16:59 -0700
+Subject: [PATCH nftables 2/2] build: Allow building from tarballs without
+ yacc/lex
+
+The generated files are included in the tarballs already, but
+configure.ac was coded to fail if yacc/lex were not found regardless.
+
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a04d94bc..3496e410 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,13 +29,13 @@ AC_PROG_SED
+ AM_PROG_LEX
+ AC_PROG_YACC
+
+-if test -z "$ac_cv_prog_YACC"
++if test -z "$ac_cv_prog_YACC" -a ! -f "${srcdir}/src/parser_bison.c"
+ then
+ echo "*** Error: No suitable bison/yacc found. ***"
+ echo " Please install the 'bison' package."
+ exit 1
+ fi
+-if test -z "$ac_cv_prog_LEX"
++if test -z "$ac_cv_prog_LEX" -a ! -f "${srcdir}/src/scanner.c"
+ then
+ echo "*** Error: No suitable flex/lex found. ***"
+ echo " Please install the 'flex' package."
+--
+2.24.1
+