commit:     e0b2068fa16248598bfe4a7790e532a43a01972c
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 08:04:30 2018 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 08:05:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b2068f

net-libs/gnutls: revert explicit prefix added for cross-compile

multilib does not work with this configuration.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=667862
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 2 +-
 net-libs/gnutls/gnutls-3.6.3.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild 
b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
index 21b4a74b0dc..9fc06eac7ed 100644
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -117,7 +117,7 @@ multilib_src_configure() {
                
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
                --without-included-libtasn1 \
                "${libconf[@]}" \
-               $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 
's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+               $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed 
-e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {

diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild 
b/net-libs/gnutls/gnutls-3.6.3.ebuild
index 92679e621dc..e28279bbf27 100644
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild
@@ -113,7 +113,7 @@ multilib_src_configure() {
                
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
                --without-included-libtasn1 \
                "${libconf[@]}" \
-               $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 
's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+               $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed 
-e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {

Reply via email to