0005-src-interface.h-fix-build-with-gcc-10.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 4ce42974267dd969a597a7357d6c98ccbe8140f8 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Mon, 17 Aug 2020 20:41:29 +0200
  4. Subject: [PATCH] src/interface.h: fix build with gcc 10
  5. This will fix the following build failure:
  6. /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
  7. /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
  8. /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
  9. Fixes:
  10. - http://autobuild.buildroot.org/results/63f7c6fc4a2a30c8eb0298856a2615f816d50299
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. [Upstream status: sent to Lennart Poettering <lennart@poettering.net>]
  13. ---
  14. src/interface.h | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/src/interface.h b/src/interface.h
  17. index 2f35a84..e603844 100644
  18. --- a/src/interface.h
  19. +++ b/src/interface.h
  20. @@ -21,8 +21,8 @@
  21. * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  22. */
  23. -int interface_auto_up;
  24. -int interface_do_message;
  25. +extern int interface_auto_up;
  26. +extern int interface_do_message;
  27. typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
  28. --
  29. 2.27.0