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

diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 78dd42e46b52b86fba228cec610cdefa9ac5c31c..f4f614daebedbd507fb8610d9c059b3b9ca3f700 100644 (file)
--- 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 bca21f0561604fa628f59c9f02e9a0f3e17458ba..c8182318d3df61a61d6da14e8ab5e37d8f11d326 100644 (file)
--- 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() {