xref: /OK3568_Linux_fs/buildroot/package/ifplugd/0005-src-interface.h-fix-build-with-gcc-10.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 4ce42974267dd969a597a7357d6c98ccbe8140f8 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Mon, 17 Aug 2020 20:41:29 +0200
4Subject: [PATCH] src/interface.h: fix build with gcc 10
5
6This will fix the following build failure:
7
8/home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -D_REENTRANT  -DSYSCONFDIR="\"/etc\"" -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -pipe -W -Wall -Wno-unused-parameter   -o ifplugstatus ifplugstatus.o interface.o -L/home/buildroot/autobuild/instance-1/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib -ldaemon
9/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interface.o:(.bss+0x0): multiple definition of `interface_do_message'; ifplugstatus.o:(.bss+0xc): first defined here
10/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interface.o:(.bss+0x4): multiple definition of `interface_auto_up'; ifplugstatus.o:(.bss+0x4): first defined here
11
12Fixes:
13 - http://autobuild.buildroot.org/results/63f7c6fc4a2a30c8eb0298856a2615f816d50299
14
15Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
16[Upstream status: sent to Lennart Poettering <lennart@poettering.net>]
17---
18 src/interface.h | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/src/interface.h b/src/interface.h
22index 2f35a84..e603844 100644
23--- a/src/interface.h
24+++ b/src/interface.h
25@@ -21,8 +21,8 @@
26  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
27  */
28
29-int interface_auto_up;
30-int interface_do_message;
31+extern int interface_auto_up;
32+extern int interface_do_message;
33
34 typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
35
36--
372.27.0
38
39