[libvirt PATCHv2 07/15] build: do not depend on yajl
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
libvirt.spec.in | 4 +---
meson.build | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 63ac63cb45..caca0bcb95 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -361,7 +361,6 @@ BuildRequires: libblkid-devel >= 2.17
BuildRequires: augeas
BuildRequires: systemd-devel >= 185
BuildRequires: libpciaccess-devel >= 0.10.9
-BuildRequires: yajl-devel
BuildRequires: json-c-devel
%if %{with_sanlock}
BuildRequires: sanlock-devel >= 2.4
@@ -1370,7 +1369,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y'
%{_specdir}/libvirt.spec)
-Dapparmor_profiles=disabled \
-Dsecdriver_apparmor=disabled \
-Dudev=enabled \
- -Dyajl=enabled \
-Djson_c=enabled \
%{?arg_sanlock} \
-Dlibpcap=enabled \
@@ -1486,7 +1484,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y'
%{_specdir}/libvirt.spec)
-Dtests=disabled \
-Dudev=disabled \
-Dwireshark_dissector=disabled \
- -Dyajl=disabled \
+ -Dyajl=disabled
%{?enable_werror}
%mingw_ninja
%endif
diff --git a/meson.build b/meson.build
index e15514ea00..977ca527f6 100644
--- a/meson.build
+++ b/meson.build
@@ -1622,7 +1622,7 @@ if not get_option('driver_ch').disabled() and
host_machine.system() == 'linux' a
endif
endif
- if not yajl_dep.found() or not json_c_dep.found()
+ if not json_c_dep.found()
use_ch = false
if get_option('driver_ch').enabled()
error('json-c is required to build Cloud-Hypervisor driver')
@@ -1696,7 +1696,7 @@ endif
if not get_option('driver_qemu').disabled()
use_qemu = true
- if not yajl_dep.found() or not json_c_dep.found()
+ if not json_c_dep.found()
use_qemu = false
if get_option('driver_qemu').enabled()
error('json-c is required to build QEMU driver')
@@ -2029,7 +2029,7 @@ endif
if not get_option('nss').disabled()
use_nss = true
- if not yajl_dep.found() or not json_c_dep.found()
+ if not json_c_dep.found()
if get_option('nss').enabled()
error('Can\'t build nss plugin without json-c')
else
--
2.46.0