From 663f2319190529eb02b5ed6f058639e123af96d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 2 Mar 2020 14:38:26 +0000 Subject: [PATCH] net-vpn/openvpn: drop broken USE=static flag, bug #704100 '-Xcompiler -static' is understood by libtool, but not gcc directly. That makes 'append-ldflags -Xcompiler -static' call always fail ./configure as: ``` configure: error: C compiler cannot create executables See `config.log' for more details ``` Reported-by: Rolf Eike Beer Closes: https://bugs.gentoo.org/704100 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich --- net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 6 ++---- net-vpn/openvpn/openvpn-2.4.6.ebuild | 6 ++---- net-vpn/openvpn/openvpn-2.4.7-r1.ebuild | 6 ++---- net-vpn/openvpn/openvpn-9999.ebuild | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild index 0c785a1bb8e7..da73ce7b6eb7 100644 --- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild @@ -15,11 +15,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" +IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" RESTRICT="!test? ( test )" -REQUIRED_USE="static? ( !plugins !pkcs11 ) - pkcs11? ( ssl ) +REQUIRED_USE="pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )" @@ -66,7 +65,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -Xcompiler -static SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IFCONFIG=/bin/ifconfig \ diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild index 90fc9bfde654..f7489160c24d 100644 --- a/net-vpn/openvpn/openvpn-2.4.6.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild @@ -15,11 +15,10 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" +IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" RESTRICT="!test? ( test )" -REQUIRED_USE="static? ( !plugins !pkcs11 ) - pkcs11? ( ssl ) +REQUIRED_USE="pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )" @@ -66,7 +65,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -Xcompiler -static SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IFCONFIG=/bin/ifconfig \ diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild index 7463968b82f7..7c4fa29d8860 100644 --- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild @@ -15,11 +15,10 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" +IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" RESTRICT="!test? ( test )" -REQUIRED_USE="static? ( !plugins !pkcs11 ) - pkcs11? ( ssl ) +REQUIRED_USE="pkcs11? ( ssl ) !plugins? ( !pam !down-root ) inotify? ( plugins )" @@ -67,7 +66,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -Xcompiler -static SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IFCONFIG=/bin/ifconfig \ diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index bd0472901623..19122b752be6 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -15,11 +15,10 @@ SLOT="0" KEYWORDS="" IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" +IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" RESTRICT="!test? ( test )" -REQUIRED_USE="static? ( !inotify !plugins !pkcs11 ) - lzo? ( !lz4 ) +REQUIRED_USE="lzo? ( !lz4 ) !plugins? ( !pam !down-root ) inotify? ( plugins )" @@ -61,7 +60,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -Xcompiler -static SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ econf \ -- 2.26.2