Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index 49e418cc82..fafc0d72be 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -61,7 +61,7 @@ option('driver_remote', type: 'feature', value: 'enabled', description: 'remote option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode') option('driver_secrets', type: 'feature', value: 'auto', description: 'local secrets management driver') option('driver_test', type: 'feature', value: 'enabled', description: 'test driver') -option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver') +option('driver_vbox', type: 'feature', value: 'auto', description: 'VirtualBox XPCOMC driver') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') option('driver_vmware', type: 'feature', value: 'auto', description: 'VMware driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozzo driver') -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/meson.build b/meson.build index a5ce8e17a8..48d0d00288 100644 --- a/meson.build +++ b/meson.build @@ -1153,7 +1153,6 @@ endif libxml_version = '2.9.1' libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version) -cc = meson.get_compiler('c') m_dep = cc.find_library('m', required : false) netcf_version = '0.1.8' -- 2.26.2

If readline is detected using pkg-config it would ignore the readline option. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- meson.build | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 0941be8136..c1f56e8fdb 100644 --- a/meson.build +++ b/meson.build @@ -1243,26 +1243,30 @@ endif # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' -readline_dep = dependency('readline', version: '>=' + readline_version, required: false) -if not readline_dep.found() - readline_dep = cc.find_library('readline', required: get_option('readline')) +if not get_option('readline').disabled() + readline_dep = dependency('readline', version: '>=' + readline_version, required: false) + if not readline_dep.found() + readline_dep = cc.find_library('readline', required: get_option('readline')) - if readline_dep.found() - # This variable is present in all reasonable (5.0+) readline versions; - # however, the macOS base system contains a library called libedit which - # takes over the readline name despite lacking many of its features. We - # want to make sure we only enable readline support when linking against - # the actual readline library, and the availability of this specific - # variable is as good a witness for that fact as any. - correct_rl = cc.has_header_symbol('readline/readline.h', 'rl_completion_quote_character', prefix: '#include <stdio.h>') - if not correct_rl - if get_option('readline').enabled() - error('readline is missing rl_completion_quote_character') - else - readline_dep = dependency('', required: false) + if readline_dep.found() + # This variable is present in all reasonable (5.0+) readline versions; + # however, the macOS base system contains a library called libedit which + # takes over the readline name despite lacking many of its features. We + # want to make sure we only enable readline support when linking against + # the actual readline library, and the availability of this specific + # variable is as good a witness for that fact as any. + correct_rl = cc.has_header_symbol('readline/readline.h', 'rl_completion_quote_character', prefix: '#include <stdio.h>') + if not correct_rl + if get_option('readline').enabled() + error('readline is missing rl_completion_quote_character') + else + readline_dep = dependency('', required: false) + endif endif endif endif +else + readline_dep = dependency('', required: false) endif if readline_dep.found() # Gross kludge for readline include path obtained through pkg-config. -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt.spec.in | 1 + meson.build | 8 +++++--- meson_options.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c0d84c0e75..7c4ccaa659 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1168,6 +1168,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -Dyajl=enabled \ %{?arg_sanlock} \ -Dlibpcap=enabled \ + -Dlibnl=enabled \ -Daudit=enabled \ -Ddtrace=enabled \ %{?arg_firewalld} \ diff --git a/meson.build b/meson.build index bb01731264..b6e0b1cb76 100644 --- a/meson.build +++ b/meson.build @@ -1075,9 +1075,9 @@ libiscsi_version = '1.18.0' libiscsi_dep = dependency('libiscsi', version: '>=' + libiscsi_version, required: get_option('libiscsi')) libnl_version = '3.0' -if host_machine.system() == 'linux' - libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: false) - libnl_route_dep = dependency('libnl-route-3.0', version: '>=' + libnl_version, required: false) +if not get_option('libnl').disabled() and host_machine.system() == 'linux' + libnl_dep = dependency('libnl-3.0', version: '>=' + libnl_version, required: get_option('libnl')) + libnl_route_dep = dependency('libnl-route-3.0', version: '>=' + libnl_version, required: get_option('libnl')) if libnl_dep.found() and libnl_route_dep.found() libnl_dep = declare_dependency( @@ -1085,6 +1085,8 @@ if host_machine.system() == 'linux' ) conf.set('WITH_LIBNL', 1) endif +elif get_option('libnl').enabled() + error('libnl can be enabled only on linux') else libnl_dep = dependency('', required: false) endif diff --git a/meson_options.txt b/meson_options.txt index 36aa763526..b3f4d7744f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,6 +21,7 @@ option('curl', type: 'feature', value: 'auto', description: 'curl support') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') +option('libnl', type: 'feature', value: 'auto', description: 'libnl support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support') option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') -- 2.26.2

On Thu, 2020-10-08 at 15:58 +0200, Pavel Hrdina wrote: Shouldn't you add -Drbd=enabled to libvirt.spec.in now? -- Andrea Bolognani / Red Hat / Virtualization

We don't use the lib prefix for all libraries but in these cases it makes sense to use the prefix. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- meson.build | 8 ++++---- src/bhyve/meson.build | 4 ++-- src/util/meson.build | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index af82f37d32..cd35756a8a 100644 --- a/meson.build +++ b/meson.build @@ -1066,9 +1066,9 @@ gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) # Check for BSD kvm (kernel memory interface) if host_machine.system() == 'freebsd' - kvm_dep = cc.find_library('kvm') + libkvm_dep = cc.find_library('kvm') else - kvm_dep = dependency('', required: false) + libkvm_dep = dependency('', required: false) endif libiscsi_version = '1.18.0' @@ -1160,7 +1160,7 @@ endif libxml_version = '2.9.1' libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version) -m_dep = cc.find_library('m', required : false) +libm_dep = cc.find_library('m', required : false) netcf_version = '0.1.8' netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf')) @@ -1380,7 +1380,7 @@ if udev_dep.found() conf.set('WITH_UDEV', 1) endif -util_dep = cc.find_library('util', required: false) +libutil_dep = cc.find_library('util', required: false) if host_machine.system() == 'windows' ole32_dep = cc.find_library('ole32') diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build index 975f93a9c0..2b65eecf5e 100644 --- a/src/bhyve/meson.build +++ b/src/bhyve/meson.build @@ -21,9 +21,9 @@ if conf.has('WITH_BHYVE') ], dependencies: [ access_dep, - kvm_dep, + libkvm_dep, + libutil_dep, src_dep, - util_dep, ], include_directories: [ conf_inc_dir, diff --git a/src/util/meson.build b/src/util/meson.build index 4d63173cbd..3b711b1dc2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -187,13 +187,13 @@ virt_util_lib = static_library( devmapper_dep, gnutls_dep, intl_dep, + libm_dep, libnl_dep, - m_dep, + libutil_dep, numactl_dep, secdriver_dep, src_dep, thread_dep, - util_dep, win32_dep, yajl_dep, ], -- 2.26.2

These are always enabled so it doesn't make any sense to have the result in summary as meson will fail if they are missing. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build index e94025d315..5a99f59b0c 100644 --- a/meson.build +++ b/meson.build @@ -2390,9 +2390,7 @@ libs_summary = { 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), - 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), - 'gnutls': gnutls_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libkvm': libkvm_dep.found(), 'libm': libm_dep.found(), @@ -2402,7 +2400,6 @@ libs_summary = { 'libssh': libssh_dep.found(), 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), - 'libxml': libxml_dep.found(), 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, 'nss': conf.has('WITH_NSS'), -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- libvirt.spec.in | 1 + meson.build | 6 +++++- meson_options.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c4ccaa659..ef70e4dd29 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1184,6 +1184,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) %{?enable_werror} \ -Dexpensive_tests=enabled \ -Dinit_script=systemd \ + -Ddocs=enabled \ %{?arg_login_shell} %meson_build diff --git a/meson.build b/meson.build index d53909948e..f44cb4424a 100644 --- a/meson.build +++ b/meson.build @@ -2211,7 +2211,10 @@ subdir('examples') subdir('po') -subdir('docs') +gen_docs = not get_option('docs').disabled() +if gen_docs + subdir('docs') +endif subdir('build-aux') @@ -2436,6 +2439,7 @@ endif misc_summary = { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, + 'docs': gen_docs, 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), diff --git a/meson_options.txt b/meson_options.txt index 452fdab4d0..3c6d6a03c5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,7 @@ option('expensive_tests', type: 'feature', value: 'auto', description: 'set the option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to include rpath information in installed binaries and libraries') +option('docs', type: 'feature', value: 'auto', description: 'whether to generate documentation') # build dependencies options -- 2.26.2

On Thu, 2020-10-08 at 15:59 +0200, Pavel Hrdina wrote: Don't we want -Dtests=enabled in libvirt.spec.in at this point? -- Andrea Bolognani / Red Hat / Virtualization