On Thu, Sep 05, 2024 at 15:49:40 +0200, Ján Tomko wrote:
Drop the yajl option and all references to it.
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- libvirt.spec.in | 1 - meson.build | 2 +- meson_options.txt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-)
IMO you want to squash 7/15 and 12/15 into this patch as well as the detection bit of 14/15. Since the presence of #ifdef checks mentioning WITH_YAJL is not a problem the removal of the old implementation code can stay as a separate patch.
diff --git a/libvirt.spec.in b/libvirt.spec.in index caca0bcb95..3cb1dab98f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1484,7 +1484,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dtests=disabled \ -Dudev=disabled \ -Dwireshark_dissector=disabled \ - -Dyajl=disabled %{?enable_werror} %mingw_ninja %endif diff --git a/meson.build b/meson.build index 977ca527f6..9605d58537 100644 --- a/meson.build +++ b/meson.build @@ -1379,7 +1379,7 @@ if wireshark_dep.found() endif
yajl_version = '2.0.3' -yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: get_option('yajl')) +yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: false) if yajl_dep.found() # Kludge for yajl include path on non-Linux # diff --git a/meson_options.txt b/meson_options.txt index 122cda0350..3dc3e8667b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -51,7 +51,6 @@ option('udev', type: 'feature', value: 'auto', description: 'udev support') # dep:driver_remote option('wireshark_dissector', type: 'feature', value: 'auto', description: 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wireshark plugins directory for use when installing wireshark plugin') -option('yajl', type: 'feature', value: 'auto', description: 'yajl support')
Reviewed-by: Peter Krempa <pkrempa@redhat.com>