summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-05-17 13:08:20 +0200
committerJeroen Roovers <jer@gentoo.org>2020-05-17 13:09:19 +0200
commite432f4606c7ec51dfce00b648b76fdab8263ebd6 (patch)
tree711c43d7a01a975d9d6610ce9184b128e5015131 /net-dialup/dwun
parentnet-analyzer/zabbix: bump to 5.0.0 (diff)
downloadgentoo-e432f4606c7ec51dfce00b648b76fdab8263ebd6.tar.gz
gentoo-e432f4606c7ec51dfce00b648b76fdab8263ebd6.tar.bz2
gentoo-e432f4606c7ec51dfce00b648b76fdab8263ebd6.zip
net-dialup/dwun: Fix building with CFLAGS=-fno-common
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://bugs.gentoo.org/706982 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-dialup/dwun')
-rw-r--r--net-dialup/dwun/dwun-0.96e-r4.ebuild4
-rw-r--r--net-dialup/dwun/files/dwun-0.96e-fno-common.patch41
2 files changed, 44 insertions, 1 deletions
diff --git a/net-dialup/dwun/dwun-0.96e-r4.ebuild b/net-dialup/dwun/dwun-0.96e-r4.ebuild
index fbc86601b416..aa99a75ba5ee 100644
--- a/net-dialup/dwun/dwun-0.96e-r4.ebuild
+++ b/net-dialup/dwun/dwun-0.96e-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,6 +16,8 @@ KEYWORDS="~amd64 x86"
DOCS=( AUTHORS ChangeLog QUICKSTART README TODO UPGRADING )
src_prepare() {
+ eapply "${FILESDIR}"/${P}-fno-common.patch
+
sed -i -e "s:TODO QUICKSTART README UPGRADING ChangeLog COPYING AUTHORS::" Makefile.in || die
tc-export CC
diff --git a/net-dialup/dwun/files/dwun-0.96e-fno-common.patch b/net-dialup/dwun/files/dwun-0.96e-fno-common.patch
new file mode 100644
index 000000000000..c84c027e42d5
--- /dev/null
+++ b/net-dialup/dwun/files/dwun-0.96e-fno-common.patch
@@ -0,0 +1,41 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -37,11 +37,11 @@
+ /* extern'ed in main.h */
+ struct settings set;
+ char *error_messages;
++enum MYLOG_OPTIONS MYLOG_OPTIONS = MYLOG_STDERR;
+
+ int main(int argc, char *argv[])
+ {
+ char orig_work_dir[MAXPATHLEN];
+- MYLOG_OPTIONS = MYLOG_STDERR;
+ umask(022); /* -rw-r--r- */
+
+ if (!(error_messages = xmalloc(MAX_LOG_LENGTH)))
+--- a/src/shared.h
++++ b/src/shared.h
+@@ -56,10 +56,11 @@
+ char *external; /* named pipe (optional) */
+ };
+
+-enum {
++enum MYLOG_OPTIONS {
+ MYLOG_STDERR,
+ MYLOG_STDERR_DATEPID,
+ MYLOG_SYSLOG
+-} MYLOG_OPTIONS;
++};
++extern enum MYLOG_OPTIONS MYLOG_OPTIONS;
+
+ #endif
+--- a/src/util.c
++++ b/src/util.c
+@@ -26,6 +26,7 @@
+ #include "util.h"
+ #include "child.h"
+ #include "main.h"
++#include "shared.h"
+
+ static bool create_file(char *file, int options);
+ static void print_date_pid(void);