From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AAEF81384B4 for ; Sun, 20 Dec 2015 19:17:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAB3621C088; Sun, 20 Dec 2015 19:17:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 737BF21C088 for ; Sun, 20 Dec 2015 19:17:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 093D034074E for ; Sun, 20 Dec 2015 19:17:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09D89C7A for ; Sun, 20 Dec 2015 19:17:38 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1450639002.64ce86d1757fa73a25cdca0287d5360cca5b531b.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-2.5.0.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 64ce86d1757fa73a25cdca0287d5360cca5b531b X-VCS-Branch: master Date: Sun, 20 Dec 2015 19:17:38 +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: f9662792-4b44-4f42-9995-f1232795ca2c X-Archives-Hash: 45932f5f33ec0ce00efbf75c65521064 commit: 64ce86d1757fa73a25cdca0287d5360cca5b531b Author: Mike Frysinger gentoo org> AuthorDate: Sun Dec 20 19:16:37 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Dec 20 19:16:42 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ce86d1 app-emulation/qemu: disable libgcrypt usage #568856 app-emulation/qemu/qemu-2.5.0.ebuild | 6 ++++++ app-emulation/qemu/qemu-9999.ebuild | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app-emulation/qemu/qemu-2.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild index 249a20a..70f595e 100644 --- a/app-emulation/qemu/qemu-2.5.0.ebuild +++ b/app-emulation/qemu/qemu-2.5.0.ebuild @@ -343,6 +343,11 @@ qemu_src_configure() { --disable-guest-agent --disable-strip --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt --python="${PYTHON}" --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" @@ -372,6 +377,7 @@ qemu_src_configure() { $(conf_softmmu fdt) $(conf_softmmu glusterfs) $(conf_softmmu gnutls) + $(conf_softmmu gnutls nettle) $(conf_softmmu gtk) $(conf_softmmu infiniband rdma) $(conf_softmmu iscsi libiscsi) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 249a20a..70f595e 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -343,6 +343,11 @@ qemu_src_configure() { --disable-guest-agent --disable-strip --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt --python="${PYTHON}" --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" @@ -372,6 +377,7 @@ qemu_src_configure() { $(conf_softmmu fdt) $(conf_softmmu glusterfs) $(conf_softmmu gnutls) + $(conf_softmmu gnutls nettle) $(conf_softmmu gtk) $(conf_softmmu infiniband rdma) $(conf_softmmu iscsi libiscsi)