summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-03-24 22:48:36 +0000
committerSam James <sam@gentoo.org>2022-03-24 23:01:35 +0000
commite78ff1747765da9b82919cad40e123bd83591879 (patch)
treecfeaa02b13294d7b538c9c762cedb9561b3b2c36
parentdev-python/flask-security: keyword 4.1.3 for ~riscv (diff)
downloadgentoo-e78ff1747765da9b82919cad40e123bd83591879.tar.gz
gentoo-e78ff1747765da9b82919cad40e123bd83591879.tar.bz2
gentoo-e78ff1747765da9b82919cad40e123bd83591879.zip
net-analyzer/nfdump: fix autoreconf
Closes: https://bugs.gentoo.org/832420 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch19
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.23.ebuild3
2 files changed, 21 insertions, 1 deletions
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
new file mode 100644
index 000000000000..ac25ee094653
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
@@ -0,0 +1,19 @@
+Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
+https://bugs.gentoo.org/832420
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,4 @@
++ACLOCAL_AMFLAGS = -I m4
+
+ SUBDIRS = . bin man doc
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
+
+ AC_CONFIG_HEADER([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIR([m4])
+
+ # Checks for programs.
+ AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
index 9c9c2bd847b6..dca53c21054e 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.6.19-compiler.patch
"${FILESDIR}"/${PN}-1.6.19-libft.patch
+ "${FILESDIR}"/${PN}-1.6.23-m4-dir.patch
)
DOCS=( AUTHORS ChangeLog README.md )