diff options
| author |   Sam James <sam@gentoo.org> | 2021-10-14 08:15:27 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-10-14 08:23:46 +0100 |
| commit | 349d5ffff39b4f54eec062cb77445db094462d26 (patch) | |
| tree | 61014d2c672ca26144be60c22ff04b03de22a0f9 /net-analyzer | |
| parent | dev-libs/libmemcached: drop 1.0.18-r3 (diff) | |
| download | gentoo-349d5ffff39b4f54eec062cb77445db094462d26.tar.gz gentoo-349d5ffff39b4f54eec062cb77445db094462d26.tar.bz2 gentoo-349d5ffff39b4f54eec062cb77445db094462d26.zip | |
net-analyzer/packit: fix autoreconf with newer automake
Closes: https://bugs.gentoo.org/816753
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/packit/files/packit-1.7-configure.patch | 67 | ||||
| -rw-r--r-- | net-analyzer/packit/packit-1.7.ebuild | 2 |
2 files changed, 69 insertions, 0 deletions
diff --git a/net-analyzer/packit/files/packit-1.7-configure.patch b/net-analyzer/packit/files/packit-1.7-configure.patch new file mode 100644 index 000000000000..0f87f0408d8e --- /dev/null +++ b/net-analyzer/packit/files/packit-1.7-configure.patch @@ -0,0 +1,67 @@ +https://github.com/resurrecting-open-source-projects/packit/pull/19 +https://bugs.gentoo.org/816753 + +From 030cdc3f6ded1d206ca16dacc19aef181adba708 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 14 Oct 2021 08:11:24 +0100 +Subject: [PATCH 1/2] configure.ac: fix autoreconf with newer automake + +Newer automake forbids repeated calls to AM_INIT_AUTOMAKE. + +Bug: https://bugs.gentoo.org/816753 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,6 @@ + AC_PREREQ([2.69]) + AC_INIT([packit], [1.7], [https://github.com/resurrecting-open-source-projects/packit/issues]) + AC_CONFIG_SRCDIR([src/main.c]) +-AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(config.h) + AC_MSG_RESULT(beginning auto-configuration process for packit...) + AC_PREFIX_DEFAULT(/usr/local) + +From f62d3d40ff99ac39e7cbdea9991bec639a16d3a0 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 14 Oct 2021 08:12:14 +0100 +Subject: [PATCH 2/2] configure.ac: don't ignore failure to find packages + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(libnet.h,, LIBNET="no") + if test "$LIBNET" = "no"; then + echo "" + echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version." +- exit; ++ exit 1; + fi + + AC_ARG_WITH(libpcap_includes, +@@ -161,7 +161,7 @@ AC_CHECK_HEADERS(pcap.h,, LIBPCAP="no") + if test "$LIBNET" = "no"; then + echo "" + echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version." +- exit; ++ exit 1; + fi + + dnl Checks for library functions. +@@ -181,7 +181,7 @@ AC_CHECK_LIB(net, libnet_build_ipv4,, LIBNET="no") + if test "$LIBNET" = "no"; then + echo "" + echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version." +- exit; ++ exit 1; + fi + + AC_ARG_WITH(libpcap_libraries, +@@ -196,7 +196,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,, LIBPCAP="no") + if test "$LIBPCAP" = "no"; then + echo "" + echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version." +- exit; ++ exit 1; + else + AC_CHECK_LIB(pcap, pcap_setnonblock,, SETNONBLOCK="no") + if test "$SETNONBLOCK" = "no"; then diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild index 6f454fbc9ba2..a1576a6b050e 100644 --- a/net-analyzer/packit/packit-1.7.ebuild +++ b/net-analyzer/packit/packit-1.7.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="network packet generator and capture tool" @@ -19,6 +20,7 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.0-noopt.patch + "${FILESDIR}"/${PN}-1.7-configure.patch ) src_prepare() { |