]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: add libnl build option
authorPavel Hrdina <phrdina@redhat.com>
Thu, 8 Oct 2020 11:01:29 +0000 (13:01 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Fri, 9 Oct 2020 11:44:54 +0000 (13:44 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
libvirt.spec.in
meson.build
meson_options.txt

index 80563ce6ef0cd4b3e63f45a2089683ca273c2046..cf6c95159318a2f8240ee2ebbcc99ccbf7937ba1 100644 (file)
@@ -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} \
index 6ee15ca8b87cf72a156b51e1cf0f3a36a187ba41..69302766a964e753a3d5a857567173162896a1a9 100644 (file)
@@ -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
index 36aa7635267848a48278e757523434d70e315555..b3f4d7744fcb44cb9f0b06476ede424982ccc02a 100644 (file)
@@ -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')