On 23/11/20 15:40, Stefan Weil wrote:
The Meson checks obviously don't use those flags.
Indeed they don't. For 0.56 however something like this should be doable:
diff --git a/meson.build b/meson.build
index 5062407c70..25940f8de7 100644
--- a/meson.build
+++ b/meson.build
@@ -107,6 +107,22 @@
add_project_arguments(config_host['QEMU_CXXFLAGS'].split(),
add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(),
native: false, language: ['c', 'cpp', 'objc'])
+include_args = []
+library_dirs = []
+foreach arg : config_host['QEMU_CFLAGS'].split() +
config_host['QEMU_LDFLAGS'].split()
+ if arg.startswith('-I')
+ include_args += arg
+ endif
+ if arg.startswith('-L')
+ library_dirs = arg.substring(2)
+ endif
+endif
+find_library_args = {
+ 'static': enable_static,
+ 'header_args': include_args,
+ 'dirs': library_dirs
+}
+
if targetos == 'linux'
add_project_arguments('-isystem', meson.current_source_dir() /
'linux-headers',
'-isystem', 'linux-headers',
@@ -656,10 +672,10 @@ if get_option('vnc').enabled()
method: 'pkg-config', static: enable_static)
jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'],
required: get_option('vnc_jpeg'),
- static: enable_static)
+ kwargs: find_library_args)
sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
required: get_option('vnc_sasl'),
- static: enable_static)
+ kwargs: find_library_args)
if sasl.found()
sasl = declare_dependency(dependencies: sasl,
compile_args: '-DSTRUCT_IOVEC_DEFINED')
Paolo
