| 1 |
commit: 64ce86d1757fa73a25cdca0287d5360cca5b531b |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 20 19:16:37 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 20 19:16:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ce86d1 |
| 7 |
|
| 8 |
app-emulation/qemu: disable libgcrypt usage #568856 |
| 9 |
|
| 10 |
app-emulation/qemu/qemu-2.5.0.ebuild | 6 ++++++ |
| 11 |
app-emulation/qemu/qemu-9999.ebuild | 6 ++++++ |
| 12 |
2 files changed, 12 insertions(+) |
| 13 |
|
| 14 |
diff --git a/app-emulation/qemu/qemu-2.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild |
| 15 |
index 249a20a..70f595e 100644 |
| 16 |
--- a/app-emulation/qemu/qemu-2.5.0.ebuild |
| 17 |
+++ b/app-emulation/qemu/qemu-2.5.0.ebuild |
| 18 |
@@ -343,6 +343,11 @@ qemu_src_configure() { |
| 19 |
--disable-guest-agent |
| 20 |
--disable-strip |
| 21 |
--disable-werror |
| 22 |
+ # We support gnutls/nettle for crypto operations. It is possible |
| 23 |
+ # to use gcrypt when gnutls/nettle are disabled (but not when they |
| 24 |
+ # are enabled), but it's not really worth the hassle. Disable it |
| 25 |
+ # all the time to avoid automatically detecting it. #568856 |
| 26 |
+ --disable-gcrypt |
| 27 |
--python="${PYTHON}" |
| 28 |
--cc="$(tc-getCC)" |
| 29 |
--cxx="$(tc-getCXX)" |
| 30 |
@@ -372,6 +377,7 @@ qemu_src_configure() { |
| 31 |
$(conf_softmmu fdt) |
| 32 |
$(conf_softmmu glusterfs) |
| 33 |
$(conf_softmmu gnutls) |
| 34 |
+ $(conf_softmmu gnutls nettle) |
| 35 |
$(conf_softmmu gtk) |
| 36 |
$(conf_softmmu infiniband rdma) |
| 37 |
$(conf_softmmu iscsi libiscsi) |
| 38 |
|
| 39 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 40 |
index 249a20a..70f595e 100644 |
| 41 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 42 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 43 |
@@ -343,6 +343,11 @@ qemu_src_configure() { |
| 44 |
--disable-guest-agent |
| 45 |
--disable-strip |
| 46 |
--disable-werror |
| 47 |
+ # We support gnutls/nettle for crypto operations. It is possible |
| 48 |
+ # to use gcrypt when gnutls/nettle are disabled (but not when they |
| 49 |
+ # are enabled), but it's not really worth the hassle. Disable it |
| 50 |
+ # all the time to avoid automatically detecting it. #568856 |
| 51 |
+ --disable-gcrypt |
| 52 |
--python="${PYTHON}" |
| 53 |
--cc="$(tc-getCC)" |
| 54 |
--cxx="$(tc-getCXX)" |
| 55 |
@@ -372,6 +377,7 @@ qemu_src_configure() { |
| 56 |
$(conf_softmmu fdt) |
| 57 |
$(conf_softmmu glusterfs) |
| 58 |
$(conf_softmmu gnutls) |
| 59 |
+ $(conf_softmmu gnutls nettle) |
| 60 |
$(conf_softmmu gtk) |
| 61 |
$(conf_softmmu infiniband rdma) |
| 62 |
$(conf_softmmu iscsi libiscsi) |
Archives