| 1 |
commit: e0b2068fa16248598bfe4a7790e532a43a01972c |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 6 08:04:30 2018 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 6 08:05:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b2068f |
| 7 |
|
| 8 |
net-libs/gnutls: revert explicit prefix added for cross-compile |
| 9 |
|
| 10 |
multilib does not work with this configuration. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=667862 |
| 13 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 14 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 15 |
|
| 16 |
net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 2 +- |
| 17 |
net-libs/gnutls/gnutls-3.6.3.ebuild | 2 +- |
| 18 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 21 |
index 21b4a74b0dc..9fc06eac7ed 100644 |
| 22 |
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 23 |
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 24 |
@@ -117,7 +117,7 @@ multilib_src_configure() { |
| 25 |
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
| 26 |
--without-included-libtasn1 \ |
| 27 |
"${libconf[@]}" \ |
| 28 |
- $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") |
| 29 |
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
| 30 |
} |
| 31 |
|
| 32 |
multilib_src_install_all() { |
| 33 |
|
| 34 |
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 35 |
index 92679e621dc..e28279bbf27 100644 |
| 36 |
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 37 |
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 38 |
@@ -113,7 +113,7 @@ multilib_src_configure() { |
| 39 |
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
| 40 |
--without-included-libtasn1 \ |
| 41 |
"${libconf[@]}" \ |
| 42 |
- $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") |
| 43 |
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
| 44 |
} |
| 45 |
|
| 46 |
multilib_src_install_all() { |
Archives