NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

meson: add option for building with json-c

Browse Source 
Also disable it immediately for the mingw build because it's not
available there.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko
2024-02-08 16:44:15 +01:00
parent 297fbcb346
commit 1873b54512
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libvirt.spec.in
View File

@@ -1367,6 +1367,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
-Dapparmor_profiles=disabled \ -Dapparmor_profiles=disabled \
-Dsecdriver_apparmor=disabled \ -Dsecdriver_apparmor=disabled \
-Dudev=enabled \ -Dudev=enabled \
-Djson_c=disabled \
-Dyajl=enabled \ -Dyajl=enabled \
%{?arg_sanlock} \ %{?arg_sanlock} \
-Dlibpcap=enabled \ -Dlibpcap=enabled \
@@ -1439,6 +1440,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
-Dfuse=disabled \ -Dfuse=disabled \
-Dglusterfs=disabled \ -Dglusterfs=disabled \
-Dhost_validate=disabled \ -Dhost_validate=disabled \
-Djson_c=disabled \
-Dlibiscsi=disabled \ -Dlibiscsi=disabled \
-Dnbdkit=disabled \ -Dnbdkit=disabled \
-Dnbdkit_config_default=disabled \ -Dnbdkit_config_default=disabled \

8
meson.build
View File

@@ -1023,6 +1023,13 @@ glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, r
gnutls_version = '3.6.0' gnutls_version = '3.6.0'
gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version)
json_c_version = '0.14'
json_c_dep = dependency('json-c', version: '>=' + json_c_version, required: get_option('json_c'))
if json_c_dep.found()
conf.set('WITH_JSON_C', 1)
conf.set('WITH_JSON', 1)
endif
# Check for BSD kvm (kernel memory interface) # Check for BSD kvm (kernel memory interface)
if host_machine.system() == 'freebsd' if host_machine.system() == 'freebsd'
libkvm_dep = cc.find_library('kvm') libkvm_dep = cc.find_library('kvm')
@@ -2342,6 +2349,7 @@ libs_summary = {
'fuse': fuse_dep.found(), 'fuse': fuse_dep.found(),
'glusterfs': glusterfs_dep.found(), 'glusterfs': glusterfs_dep.found(),
'libbsd': libbsd_dep.found(), 'libbsd': libbsd_dep.found(),
'json-c': json_c_dep.found(),
'libiscsi': libiscsi_dep.found(), 'libiscsi': libiscsi_dep.found(),
'libkvm': libkvm_dep.found(), 'libkvm': libkvm_dep.found(),
'libnbd': libnbd_dep.found(), 'libnbd': libnbd_dep.found(),

1
meson_options.txt
View File

@@ -28,6 +28,7 @@ option('capng', type: 'feature', value: 'auto', description: 'cap-ng support')
option('curl', type: 'feature', value: 'auto', description: 'curl support') option('curl', type: 'feature', value: 'auto', description: 'curl support')
option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('fuse', type: 'feature', value: 'auto', description: 'fuse support')
option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support')
option('json_c', type: 'feature', value: 'auto', description: 'JSON-C support')
option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support')
option('libnl', type: 'feature', value: 'auto', description: 'libnl support') option('libnl', type: 'feature', value: 'auto', description: 'libnl support')
option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support')