summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-04-15 09:33:01 +0200
committerJeroen Roovers <jer@gentoo.org>2020-04-15 09:34:13 +0200
commitfe843648c530f6c6e8a7c3a9ed06dd3c63611366 (patch)
tree957d93d3b90e914605f4cc891c3941a9be86422c /net-analyzer/barnyard2
parentx11-misc/vdpauinfo: Version 1.4 (diff)
downloadgentoo-fe843648c530f6c6e8a7c3a9ed06dd3c63611366.tar.gz
gentoo-fe843648c530f6c6e8a7c3a9ed06dd3c63611366.tar.bz2
gentoo-fe843648c530f6c6e8a7c3a9ed06dd3c63611366.zip
net-analyzer/barnyard2: Prevent editing out -Werror
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://bugs.gentoo.org/717466 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer/barnyard2')
-rw-r--r--net-analyzer/barnyard2/barnyard2-1.13.ebuild1
-rw-r--r--net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch17
2 files changed, 18 insertions, 0 deletions
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
index b5215fde7f42..377952066866 100644
--- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.13-libdir.patch
"${FILESDIR}"/${PN}-1.13-my_bool.patch
"${FILESDIR}"/${PN}-1.13-odbc.patch
+ "${FILESDIR}"/${PN}-1.13-Werror.patch
"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch
)
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch
new file mode 100644
index 000000000000..e3b8b9c9ae2a
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch
@@ -0,0 +1,17 @@
+--- a/configure.in
++++ b/configure.in
+@@ -12,14 +12,6 @@
+ NO_OPTIMIZE="no"
+ ADD_WERROR="no"
+
+-# Test for -Werror and sed it out for now since some of the auto tests,
+-# for example AC_CHECK_LIB, will fail because of
+-# warning: conflicting types for built-in function <func>
+-if eval "echo $CFLAGS | grep -e -Werror"; then
+- CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"`
+- ADD_WERROR="yes"
+-fi
+-
+ # Disable annoying practice of recursively re-running the autotools
+ AM_MAINTAINER_MODE
+ AC_PROG_CC_STDC