From 2908e4c60a4857c99c9803ca1fd8e6bb18fcb7a5 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
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 <dylan@pnwbakers.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net> (v1)
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 lib/meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/meson.build')

diff --git a/lib/meson.build b/lib/meson.build
index 7e2c9b7a..8961ca49 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -59,7 +59,6 @@ lib_deps = [
 	libkmod,
 	libprocps,
 	libudev,
-	libunwind,
 	libdw,
 	pciaccess,
 	pthreads,
@@ -76,6 +75,12 @@ else
 	inc = [ inc, include_directories('stubs/drm') ]
 endif
 
+if libunwind.found()
+	lib_deps += libunwind
+else
+	inc = [ inc, include_directories('stubs/libunwind') ]
+endif
+
 if valgrind.found()
 	lib_deps += valgrind
 endif
-- 
cgit v1.2.3