| 1 |
commit: 32fff68860e031a1fef29749447fecd7d07aa2a3 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 5 23:27:50 2018 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 6 00:32:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fff688 |
| 7 |
|
| 8 |
net-libs/gnutls: support cross-compile |
| 9 |
|
| 10 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 12 |
|
| 13 |
net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 14 ++++++-------- |
| 14 |
net-libs/gnutls/gnutls-3.6.3.ebuild | 14 ++++++-------- |
| 15 |
2 files changed, 12 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 18 |
index 1635d976bdf..21b4a74b0dc 100644 |
| 19 |
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 20 |
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 21 |
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND} |
| 22 |
test? ( |
| 23 |
seccomp? ( sys-libs/libseccomp ) |
| 24 |
)" |
| 25 |
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 26 |
- tools? ( sys-devel/autogen ) |
| 27 |
- valgrind? ( dev-util/valgrind ) |
| 28 |
+BDEPEND=">=virtual/pkgconfig-0-r1 |
| 29 |
doc? ( dev-util/gtk-doc ) |
| 30 |
nls? ( sys-devel/gettext ) |
| 31 |
+ tools? ( sys-devel/autogen ) |
| 32 |
+ valgrind? ( dev-util/valgrind ) |
| 33 |
test-full? ( |
| 34 |
app-crypt/dieharder |
| 35 |
app-misc/datefudge |
| 36 |
@@ -79,10 +79,6 @@ src_prepare() { |
| 37 |
multilib_src_configure() { |
| 38 |
LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
| 39 |
|
| 40 |
- # remove magic of library detection |
| 41 |
- # bug#438222 |
| 42 |
- local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
| 43 |
- |
| 44 |
# TPM needs to be tested before being enabled |
| 45 |
libconf+=( --without-tpm ) |
| 46 |
|
| 47 |
@@ -117,9 +113,11 @@ multilib_src_configure() { |
| 48 |
$(use_with idn) \ |
| 49 |
$(use_with pkcs11 p11-kit) \ |
| 50 |
$(use_with zlib) \ |
| 51 |
+ --disable-rpath \ |
| 52 |
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
| 53 |
--without-included-libtasn1 \ |
| 54 |
- "${libconf[@]}" |
| 55 |
+ "${libconf[@]}" \ |
| 56 |
+ $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") |
| 57 |
} |
| 58 |
|
| 59 |
multilib_src_install_all() { |
| 60 |
|
| 61 |
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 62 |
index fefc8766f6a..92679e621dc 100644 |
| 63 |
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 64 |
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 65 |
@@ -33,11 +33,11 @@ DEPEND="${RDEPEND} |
| 66 |
test? ( |
| 67 |
seccomp? ( sys-libs/libseccomp ) |
| 68 |
)" |
| 69 |
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 70 |
- tools? ( sys-devel/autogen ) |
| 71 |
- valgrind? ( dev-util/valgrind ) |
| 72 |
+BDEPEND=">=virtual/pkgconfig-0-r1 |
| 73 |
doc? ( dev-util/gtk-doc ) |
| 74 |
nls? ( sys-devel/gettext ) |
| 75 |
+ tools? ( sys-devel/autogen ) |
| 76 |
+ valgrind? ( dev-util/valgrind ) |
| 77 |
test-full? ( |
| 78 |
app-crypt/dieharder |
| 79 |
>=app-misc/datefudge-1.22 |
| 80 |
@@ -78,10 +78,6 @@ src_prepare() { |
| 81 |
multilib_src_configure() { |
| 82 |
LINGUAS="${LINGUAS//en/en@boldquot en@quot}" |
| 83 |
|
| 84 |
- # remove magic of library detection |
| 85 |
- # bug#438222 |
| 86 |
- local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) |
| 87 |
- |
| 88 |
# TPM needs to be tested before being enabled |
| 89 |
libconf+=( --without-tpm ) |
| 90 |
|
| 91 |
@@ -113,9 +109,11 @@ multilib_src_configure() { |
| 92 |
$(use_enable tls-heartbeat heartbeat-support) \ |
| 93 |
$(use_with idn) \ |
| 94 |
$(use_with pkcs11 p11-kit) \ |
| 95 |
+ --disable-rpath \ |
| 96 |
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
| 97 |
--without-included-libtasn1 \ |
| 98 |
- "${libconf[@]}" |
| 99 |
+ "${libconf[@]}" \ |
| 100 |
+ $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") |
| 101 |
} |
| 102 |
|
| 103 |
multilib_src_install_all() { |
Archives