[app-emulation/qemu] sync with tree

This commit is contained in:
Robert Förster 2015-12-21 08:40:56 +01:00
parent 82bb8cfc5a
commit 1c5251fe3f

View File

@ -346,6 +346,11 @@ qemu_src_configure() {
--disable-guest-agent --disable-guest-agent
--disable-strip --disable-strip
--disable-werror --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}" --python="${PYTHON}"
--cc="$(tc-getCC)" --cc="$(tc-getCC)"
--cxx="$(tc-getCXX)" --cxx="$(tc-getCXX)"
@ -375,6 +380,7 @@ qemu_src_configure() {
$(conf_softmmu fdt) $(conf_softmmu fdt)
$(conf_softmmu glusterfs) $(conf_softmmu glusterfs)
$(conf_softmmu gnutls) $(conf_softmmu gnutls)
$(conf_softmmu gnutls nettle)
$(conf_softmmu gtk) $(conf_softmmu gtk)
$(conf_softmmu infiniband rdma) $(conf_softmmu infiniband rdma)
$(conf_softmmu iscsi libiscsi) $(conf_softmmu iscsi libiscsi)