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 9ADCC1396D1 for ; Fri, 8 Sep 2017 19:39:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB5DEE0DDD; Fri, 8 Sep 2017 19:39:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B8CF3E0DDD for ; Fri, 8 Sep 2017 19:39:03 +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 3EBAC3417D6 for ; Fri, 8 Sep 2017 19:39:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F36C79042 for ; Fri, 8 Sep 2017 19:39:00 +0000 (UTC) From: "Alon Bar-Lev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alon Bar-Lev" Message-ID: <1504899534.3aa9e882e5ff0f1f74352835953fc8a648b9f43e.alonbl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/gnutls/gnutls-3.5.15.ebuild net-libs/gnutls/gnutls-3.6.0.ebuild X-VCS-Directories: net-libs/gnutls/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 3aa9e882e5ff0f1f74352835953fc8a648b9f43e X-VCS-Branch: master Date: Fri, 8 Sep 2017 19:39:00 +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-Archives-Salt: baa5844a-af5c-4100-b71e-ca12949b756d X-Archives-Hash: 9dce151a685eb4706849e8cfc91811ac commit: 3aa9e882e5ff0f1f74352835953fc8a648b9f43e Author: Alon Bar-Lev gentoo org> AuthorDate: Fri Sep 8 19:17:14 2017 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Fri Sep 8 19:38:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa9e882 net-libs/gnutls: disable hw accesseleration at cygwin Thanks: Michael Haubenwallner Closes: https://github.com/gentoo/gentoo/pull/5636 Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-libs/gnutls/gnutls-3.5.15.ebuild | 11 ++++++++--- net-libs/gnutls/gnutls-3.6.0.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild index 78dd42e46b5..f4f614daebe 100644 --- a/net-libs/gnutls/gnutls-3.5.15.ebuild +++ b/net-libs/gnutls/gnutls-3.5.15.ebuild @@ -89,9 +89,16 @@ multilib_src_configure() { local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) # TPM needs to be tested before being enabled + libconf+=( --without-tpm ) + # hardware-accell is disabled on OSX because the asm files force # GNU-stack (as doesn't support that) and when that's removed ld # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + ECONF_SOURCE=${S} econf \ $(multilib_native_enable manpages) \ $(multilib_native_use_enable doc gtk-doc) \ @@ -117,9 +124,7 @@ multilib_src_configure() { $(use_with zlib) \ --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ --without-included-libtasn1 \ - --without-tpm \ - "${libconf[@]}" \ - $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) + "${libconf[@]}" } multilib_src_install_all() { diff --git a/net-libs/gnutls/gnutls-3.6.0.ebuild b/net-libs/gnutls/gnutls-3.6.0.ebuild index bca21f05616..c8182318d3d 100644 --- a/net-libs/gnutls/gnutls-3.6.0.ebuild +++ b/net-libs/gnutls/gnutls-3.6.0.ebuild @@ -88,9 +88,16 @@ multilib_src_configure() { local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) # TPM needs to be tested before being enabled + libconf+=( --without-tpm ) + # hardware-accell is disabled on OSX because the asm files force # GNU-stack (as doesn't support that) and when that's removed ld # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + ECONF_SOURCE=${S} econf \ $(multilib_native_enable manpages) \ $(multilib_native_use_enable doc gtk-doc) \ @@ -113,9 +120,7 @@ multilib_src_configure() { $(use_with pkcs11 p11-kit) \ --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ --without-included-libtasn1 \ - --without-tpm \ - "${libconf[@]}" \ - $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration) + "${libconf[@]}" } multilib_src_install_all() {