commit: 30f1e199eff80a08bc75f7a11a969dc6134bdd88 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Mon Apr 27 03:16:18 2020 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> 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 <williamh <AT> 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() {
