From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C82BB138351 for ; Mon, 27 Apr 2020 03:18:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0571BE0A8A; Mon, 27 Apr 2020 03:18:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CBAFE0A8A for ; Mon, 27 Apr 2020 03:18:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC2DD34FA9C for ; Mon, 27 Apr 2020 03:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 613131A8 for ; Mon, 27 Apr 2020 03:18:05 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1587957469.30f1e199eff80a08bc75f7a11a969dc6134bdd88.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/openvpn/openvpn-2.4.9.ebuild X-VCS-Directories: net-vpn/openvpn/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 30f1e199eff80a08bc75f7a11a969dc6134bdd88 X-VCS-Branch: master Date: Mon, 27 Apr 2020 03:18:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61cb75e7-e675-4d28-9937-1912ef2008f2 X-Archives-Hash: 761e980ed99fbe87a360cab5596aaeae commit: 30f1e199eff80a08bc75f7a11a969dc6134bdd88 Author: William Hubbs gentoo org> AuthorDate: Mon Apr 27 03:16:18 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Apr 27 03:17:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f1e199 fix build failures Closes: https://bugs.gentoo.org/704070 Closes: https://bugs.gentoo.org/719716 Signed-off-by: William Hubbs gentoo.org> net-vpn/openvpn/openvpn-2.4.9.ebuild | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild index 684a4871fe8..ab73cf1183c 100644 --- a/net-vpn/openvpn/openvpn-2.4.9.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild @@ -61,22 +61,34 @@ src_prepare() { } src_configure() { + local myeconfargs=( + $(use_enable inotify async-push) + $(use_enable ssl crypto) + ) + if use ssl; then + myeconfargs+=( + $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) + ) + if use libressl || ! use mbedtls; then + myeconfargs+=( + $(use_enable pkcs11) + ) + fi + fi + myeconfargs+=( + $(use_enable lz4) + $(use_enable lzo) + $(use_enable plugins) + $(use_enable iproute2) + $(use_enable pam plugin-auth-pam) + $(use_enable down-root plugin-down-root) + $(use_enable systemd) + ) SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IFCONFIG=/bin/ifconfig \ ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(use_enable lz4) \ - $(use_enable lzo) \ - $(use_enable pkcs11) \ - $(use_enable plugins) \ - $(use_enable iproute2) \ - $(use_enable pam plugin-auth-pam) \ - $(use_enable down-root plugin-down-root) \ - $(use_enable systemd) + econf "${myeconfargs[@]}" } src_test() {