From 1c5251fe3f4885cdec3edaf1540d8deeb56f5e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Mon, 21 Dec 2015 08:40:56 +0100 Subject: [PATCH] [app-emulation/qemu] sync with tree --- app-emulation/qemu/qemu-2.5.0.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-emulation/qemu/qemu-2.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild index 92fee90..6a3c35e 100644 --- a/app-emulation/qemu/qemu-2.5.0.ebuild +++ b/app-emulation/qemu/qemu-2.5.0.ebuild @@ -346,6 +346,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)" @@ -375,6 +380,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)