From 2908e4c60a4857c99c9803ca1fd8e6bb18fcb7a5 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 30 Oct 2018 13:22:12 +0100 Subject: lib: Make libunwind optional again Apparently it's really not great to require it for a bunch of platforms. Requested by Sean and Eric. v2: Use combo option (Petri). v3: Fix the right option (Petri) v4: try a bit harder ... v5: Even more simplification (Dylan) Cc: Dylan Baker Cc: Petri Latvala Reviewed-by: Eric Anholt (v1) Reviewed-by: Petri Latvala Cc: Sean Paul Cc: Eric Anholt Signed-off-by: Daniel Vetter --- meson.build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index eff35585..d1e35757 100644 --- a/meson.build +++ b/meson.build @@ -50,6 +50,7 @@ build_chamelium = get_option('build_chamelium') build_docs = get_option('build_docs') build_tests = get_option('build_tests') with_libdrm = get_option('with_libdrm') +with_libunwind = get_option('with_libunwind') build_runner = get_option('build_runner') _build_overlay = build_overlay != 'false' @@ -102,7 +103,17 @@ build_info += 'With libdrm: ' + ','.join(libdrm_info) pciaccess = dependency('pciaccess', version : '>=0.10') libkmod = dependency('libkmod') libprocps = dependency('libprocps', required : true) -libunwind = dependency('libunwind', required : true) + +libunwind = null_dep +libunwindinfo = 'No' +if with_libunwind != 'false' + libunwind = dependency('libunwind', required : with_libunwind == 'true') + if libunwind.found() + libunwindinfo = 'Yes' + endif +endif +build_info += 'With libunwind: ' + libunwindinfo + libdw = dependency('libdw', required : true) ssl = dependency('openssl', required : true) pixman = dependency('pixman-1', required : true) -- cgit v1.2.3