mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-12-08 23:03:46 +00:00
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
|
From 724b5fc2fdd2377ad4df7deb1ed739711f4bcd9b Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||
|
|
Date: Mon, 13 Aug 2018 13:39:48 +0200
|
||
|
|
Subject: [PATCH 10/16] Revert "build: switch --with-qemu default from yes to
|
||
|
|
check"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This reverts commit c5ae8e0c2b4b6bb3c667cfadaf65a66c3f4f3d85.
|
||
|
|
|
||
|
|
Jansson cannot parse QEMU's quirky JSON.
|
||
|
|
Revert back to yajl.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614569
|
||
|
|
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
---
|
||
|
|
m4/virt-driver-qemu.m4 | 6 +-----
|
||
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4
|
||
|
|
index ddb2834705..80e1d3ad46 100644
|
||
|
|
--- a/m4/virt-driver-qemu.m4
|
||
|
|
+++ b/m4/virt-driver-qemu.m4
|
||
|
|
@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
|
||
|
|
dnl
|
||
|
|
|
||
|
|
AC_DEFUN([LIBVIRT_DRIVER_ARG_QEMU], [
|
||
|
|
- LIBVIRT_ARG_WITH_FEATURE([QEMU], [QEMU/KVM], [check])
|
||
|
|
+ LIBVIRT_ARG_WITH_FEATURE([QEMU], [QEMU/KVM], [yes])
|
||
|
|
LIBVIRT_ARG_WITH([QEMU_USER], [username to run QEMU system instance as],
|
||
|
|
['platform dependent'])
|
||
|
|
LIBVIRT_ARG_WITH([QEMU_GROUP], [groupname to run QEMU system instance as],
|
||
|
|
@@ -26,10 +26,6 @@ AC_DEFUN([LIBVIRT_DRIVER_ARG_QEMU], [
|
||
|
|
])
|
||
|
|
|
||
|
|
AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [
|
||
|
|
- AC_REQUIRE([LIBVIRT_CHECK_JANSSON])
|
||
|
|
- if test "$with_qemu" = "check"; then
|
||
|
|
- with_qemu=$with_jansson
|
||
|
|
- fi
|
||
|
|
if test "$with_qemu" = "yes" ; then
|
||
|
|
AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled])
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|