[libvirt PATCH 13/20] meson: switch checks to depend on json-c instead of yajl

Ján Tomko posted 20 patches 3 months, 1 week ago
There is a newer version of this series
[libvirt PATCH 13/20] meson: switch checks to depend on json-c instead of yajl
Posted by Ján Tomko 3 months, 1 week ago
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 39d6d700d3..837b209232 100644
--- a/meson.build
+++ b/meson.build
@@ -1620,10 +1620,10 @@ if not get_option('driver_ch').disabled() and host_machine.system() == 'linux' a
     endif
   endif
 
-  if not yajl_dep.found()
+  if not json_c_dep.found()
     use_ch = false
     if get_option('driver_ch').enabled()
-      error('YAJL 2 is required to build Cloud-Hypervisor driver')
+      error('json-c is required to build Cloud-Hypervisor driver')
     endif
   endif
 
@@ -1694,10 +1694,10 @@ endif
 if not get_option('driver_qemu').disabled()
   use_qemu = true
 
-  if not yajl_dep.found()
+  if not json_c_dep.found()
     use_qemu = false
     if get_option('driver_qemu').enabled()
-      error('YAJL 2 is required to build QEMU driver')
+      error('json-c is required to build QEMU driver')
     endif
   endif
 
@@ -2027,9 +2027,9 @@ endif
 
 if not get_option('nss').disabled()
   use_nss = true
-  if not yajl_dep.found()
+  if not json_c_dep.found()
     if get_option('nss').enabled()
-      error('Can\'t build nss plugin without yajl')
+      error('Can\'t build nss plugin without json-c')
     else
       use_nss = false
     endif
-- 
2.45.2
Re: [libvirt PATCH 13/20] meson: switch checks to depend on json-c instead of yajl
Posted by Peter Krempa 3 months ago
On Wed, Aug 14, 2024 at 23:40:28 +0200, Ján Tomko wrote:
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  meson.build | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

[...]

> @@ -2027,9 +2027,9 @@ endif
>  
>  if not get_option('nss').disabled()
>    use_nss = true
> -  if not yajl_dep.found()
> +  if not json_c_dep.found()
>      if get_option('nss').enabled()
> -      error('Can\'t build nss plugin without yajl')
> +      error('Can\'t build nss plugin without json-c')
>      else
>        use_nss = false
>      endif

At least this will need to be part of the patch that refactors the
parsing in the NSS modules.