mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 02:39:08 -07:00
net-vpn/strongswan: tweak for gcc-10, bug #706408
Closes: https://bugs.gentoo.org/706408 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
45
net-vpn/strongswan/files/strongswan-5.8.2-gcc-10.patch
Normal file
45
net-vpn/strongswan/files/strongswan-5.8.2-gcc-10.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
https://bugs.gentoo.org/706408
|
||||
https://github.com/strongswan/strongswan/pull/163
|
||||
|
||||
From a1f73a67aed56628c4655caa1ae50a6a2e4ec639 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
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 <slyfox@gentoo.org>
|
||||
---
|
||||
src/swanctl/swanctl.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- 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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
@@ -45,6 +45,8 @@ RDEPEND="${COMMON_DEPEND}
|
||||
!net-vpn/libreswan
|
||||
selinux? ( sec-policy/selinux-ipsec )"
|
||||
|
||||
PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
|
||||
|
||||
UGID="ipsec"
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
Reference in New Issue
Block a user