82 lines
2.6 KiB
Text
82 lines
2.6 KiB
Text
-fexceptions:
|
|
ld: error: undefined symbol: _Unwind_Resume
|
|
|
|
Should match b_lundef in meson(1).
|
|
|
|
Index: meson.build
|
|
--- meson.build.orig
|
|
+++ meson.build
|
|
@@ -257,7 +257,6 @@ array_bounds = get_option('b_sanitize') == 'none' ? 2
|
|
|
|
cc_flags += [
|
|
'-fasynchronous-unwind-tables',
|
|
- '-fexceptions',
|
|
'-fipa-pure-const',
|
|
'-fno-common',
|
|
'-Wabsolute-value',
|
|
@@ -540,11 +539,6 @@ libvirt_nodelete = cc.get_supported_link_arguments([
|
|
])
|
|
|
|
libvirt_no_undefined = []
|
|
-if get_option('b_sanitize') == 'none'
|
|
- libvirt_no_undefined += cc.get_supported_link_arguments([
|
|
- '-Wl,-z,defs',
|
|
- ])
|
|
-endif
|
|
|
|
libvirt_no_indirect = cc.get_supported_link_arguments([
|
|
'-Wl,--no-copy-dt-needed-entries',
|
|
@@ -853,7 +847,7 @@ if not get_option('driver_remote').disabled()
|
|
xdr_dep = cc.find_library('portablexdr', required: get_option('driver_remote'))
|
|
elif host_machine.system() == 'linux'
|
|
xdr_dep = dependency('libtirpc', required: get_option('driver_remote'))
|
|
- elif host_machine.system() in [ 'freebsd', 'darwin' ]
|
|
+ elif host_machine.system() in [ 'freebsd', 'darwin', 'openbsd' ]
|
|
xdr_dep = cc.find_library('c', required: get_option('driver_remote'))
|
|
else
|
|
xdr_dep = dependency('', required: false)
|
|
@@ -938,15 +932,18 @@ if devmapper_dep.found()
|
|
conf.set('WITH_DEVMAPPER', 1)
|
|
endif
|
|
|
|
-dlopen_use = host_machine.system() != 'windows'
|
|
-dlopen_dep = cc.find_library('dl', required: dlopen_use)
|
|
-if dlopen_dep.found()
|
|
- if not cc.check_header('dlfcn.h')
|
|
- error('Unable to find dlfcn.h')
|
|
- endif
|
|
- conf.set('WITH_DLFCN_H', 1)
|
|
-endif
|
|
+#dlopen_use = host_machine.system() != 'windows'
|
|
+#dlopen_dep = cc.find_library('dl', required: dlopen_use)
|
|
+#if dlopen_dep.found()
|
|
+# if not cc.check_header('dlfcn.h')
|
|
+# error('Unable to find dlfcn.h')
|
|
+# endif
|
|
+# conf.set('WITH_DLFCN_H', 1)
|
|
+#endif
|
|
|
|
+dlopen_dep = []
|
|
+conf.set('WITH_DLFCN_H', 1)
|
|
+
|
|
fuse_version = '3.1.0'
|
|
fuse_dep = dependency('fuse3', version: '>=' + fuse_version, required: false)
|
|
if fuse_dep.found()
|
|
@@ -1879,7 +1876,7 @@ endif
|
|
|
|
driver_modules_flags = []
|
|
if conf.has('WITH_LIBVIRTD')
|
|
- if not conf.has('WITH_DLFCN_H') or not dlopen_dep.found()
|
|
+ if not conf.has('WITH_DLFCN_H') #or not dlopen_dep.found()
|
|
error('You must have dlfcn.h / dlopen() support to build driver modules')
|
|
endif
|
|
driver_modules_flags = libvirt_export_dynamic
|
|
@@ -2204,7 +2201,7 @@ libs_summary = {
|
|
'capng': capng_dep.found(),
|
|
'curl': curl_dep.found(),
|
|
'devmapper': devmapper_dep.found(),
|
|
- 'dlopen': dlopen_dep.found(),
|
|
+# 'dlopen': dlopen_dep.found(),
|
|
'fuse': fuse_dep.found(),
|
|
'glusterfs': glusterfs_dep.found(),
|
|
'libiscsi': libiscsi_dep.found(),
|