summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHank Leininger <hlein@korelogic.com>2020-02-24 23:35:19 -0700
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-10 16:57:44 +0200
commit023eef270a7c2239cb7bca2c0b059aff6a52eda3 (patch)
tree050a715bfbb7ac3b59bc577f9639cfd353397f3c
parentnet-misc/dahdi-tools: musl compile fixes. (diff)
downloadgentoo-023eef270a7c2239cb7bca2c0b059aff6a52eda3.tar.gz
gentoo-023eef270a7c2239cb7bca2c0b059aff6a52eda3.tar.bz2
gentoo-023eef270a7c2239cb7bca2c0b059aff6a52eda3.zip
net-firewall/fwknop: fix build with -fno-common or gcc-10
Cherry-picked fix from https://github.com/Jakuje/fwknop/commit/a87325b0816a79329cf0b4d4f9ebf247ead117db Signed-off-by: Hank Leininger <hlein@korelogic.com> Closes: https://bugs.gentoo.org/706816 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Closes: https://github.com/gentoo/gentoo/pull/14766 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch23
-rw-r--r--net-firewall/fwknop/fwknop-2.6.10-r1.ebuild2
2 files changed, 25 insertions, 0 deletions
diff --git a/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch
new file mode 100644
index 00000000000..9c144cc1edd
--- /dev/null
+++ b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch
@@ -0,0 +1,23 @@
+From a87325b0816a79329cf0b4d4f9ebf247ead117db Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Mon, 10 Feb 2020 15:21:56 +0100
+Subject: [PATCH] Unbreak build with gcc10 (-fno-common)
+
+Signed-off-by: Jakub Jelen <jjelen@redhat.com>
+---
+ client/log_msg.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/log_msg.h b/client/log_msg.h
+index cc17716b..3dda1614 100644
+--- a/client/log_msg.h
++++ b/client/log_msg.h
+@@ -38,7 +38,7 @@ enum
+ LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */
+ LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */
+ LOG_LAST_VERBOSITY
+-} log_level_t;
++};
+
+ #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */
+
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
index 52c57d2312c..786366d6895 100644
--- a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
@@ -43,6 +43,8 @@ REQUIRED_USE="
udp-server? ( server )
"
+PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
+
DOCS=( AUTHORS ChangeLog README )
DISABLE_AUTOFORMATTING=1