From a1f73a67aed56628c4655caa1ae50a6a2e4ec639 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2020 11:03:27 +0000 Subject: [PATCH] swanctl: fix build failure against gcc-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On gcc-10 (and gcc-9 -fno-common) build fails as: ``` libtool: link: gcc ... -o .libs/swanctl ... ld: commands/load_authorities.o:strongswan/src/swanctl/./swanctl.h:33: multiple definition of `swanctl_dir'; commands/load_all.o:strongswan/src/swanctl/./swanctl.h:33: first defined here ``` gcc-10 will change the default from -fcommon to fno-common: https://gcc.gnu.org/PR85678. The error also happens if CFLAGS=-fno-common passed explicitly. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/706408 Signed-off-by: Sergei Trofimovich --- src/swanctl/swanctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/swanctl/swanctl.h b/src/swanctl/swanctl.h index f0c334f7e..70f70d179 100644 --- a/src/swanctl/swanctl.h +++ b/src/swanctl/swanctl.h @@ -30,7 +30,7 @@ /** * Base directory for credentials and config */ -char *swanctl_dir; +extern char *swanctl_dir; /** * Configuration file for connections, etc. -- 2.25.0