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 B0EE4138334 for ; Sat, 6 Oct 2018 00:32:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84A0CE08A8; Sat, 6 Oct 2018 00:32:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 48C0AE08A8 for ; Sat, 6 Oct 2018 00:32:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 69C39335CB7 for ; Sat, 6 Oct 2018 00:32:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B15D42D for ; Sat, 6 Oct 2018 00:32:31 +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: <1538785938.32fff68860e031a1fef29749447fecd7d07aa2a3.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.19-r1.ebuild net-libs/gnutls/gnutls-3.6.3.ebuild X-VCS-Directories: net-libs/gnutls/ X-VCS-Committer: alonbl X-VCS-Committer-Name: Alon Bar-Lev X-VCS-Revision: 32fff68860e031a1fef29749447fecd7d07aa2a3 X-VCS-Branch: master Date: Sat, 6 Oct 2018 00:32:31 +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: eeb6bf82-72d0-4184-a6da-fa8a2e415e67 X-Archives-Hash: b75ace34041190473cce130c7bd42e42 commit: 32fff68860e031a1fef29749447fecd7d07aa2a3 Author: Alon Bar-Lev gentoo org> AuthorDate: Fri Oct 5 23:27:50 2018 +0000 Commit: Alon Bar-Lev gentoo org> CommitDate: Sat Oct 6 00:32:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fff688 net-libs/gnutls: support cross-compile Signed-off-by: Alon Bar-Lev gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10 net-libs/gnutls/gnutls-3.5.19-r1.ebuild | 14 ++++++-------- net-libs/gnutls/gnutls-3.6.3.ebuild | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild index 1635d976bdf..21b4a74b0dc 100644 --- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild +++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild @@ -34,11 +34,11 @@ DEPEND="${RDEPEND} test? ( seccomp? ( sys-libs/libseccomp ) )" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) +BDEPEND=">=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder app-misc/datefudge @@ -79,10 +79,6 @@ src_prepare() { multilib_src_configure() { LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - # remove magic of library detection - # bug#438222 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) - # TPM needs to be tested before being enabled libconf+=( --without-tpm ) @@ -117,9 +113,11 @@ multilib_src_configure() { $(use_with idn) \ $(use_with pkcs11 p11-kit) \ $(use_with zlib) \ + --disable-rpath \ --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ --without-included-libtasn1 \ - "${libconf[@]}" + "${libconf[@]}" \ + $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") } 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 fefc8766f6a..92679e621dc 100644 --- a/net-libs/gnutls/gnutls-3.6.3.ebuild +++ b/net-libs/gnutls/gnutls-3.6.3.ebuild @@ -33,11 +33,11 @@ DEPEND="${RDEPEND} test? ( seccomp? ( sys-libs/libseccomp ) )" -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - tools? ( sys-devel/autogen ) - valgrind? ( dev-util/valgrind ) +BDEPEND=">=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) + tools? ( sys-devel/autogen ) + valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 @@ -78,10 +78,6 @@ src_prepare() { multilib_src_configure() { LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - # remove magic of library detection - # bug#438222 - local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')) - # TPM needs to be tested before being enabled libconf+=( --without-tpm ) @@ -113,9 +109,11 @@ multilib_src_configure() { $(use_enable tls-heartbeat heartbeat-support) \ $(use_with idn) \ $(use_with pkcs11 p11-kit) \ + --disable-rpath \ --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ --without-included-libtasn1 \ - "${libconf[@]}" + "${libconf[@]}" \ + $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#") } multilib_src_install_all() {