From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Sat, 24 Nov 2018 02:22:21 +0000 (-0500)
Subject: libdw support is optional
X-Git-Tag: 1.16.2~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e501e2f5c9b69dcedaeb89a25a1de29503b1d51f;p=platform%2Fupstream%2Fgstreamer.git

libdw support is optional

This was no longer optional, leading to deadcode. This regression was
found trying to fix the unwind variant in cerbero.
---

diff --git a/meson.build b/meson.build
index 739d942..3d09d29 100644
--- a/meson.build
+++ b/meson.build
@@ -347,7 +347,7 @@ endif
 
 backtrace_deps = []
 unwind_dep = dependency('libunwind', required : get_option('libunwind'))
-dw_dep = dependency('libdw', required: get_option('libunwind'))
+dw_dep = dependency('libdw', required: get_option('libdw'))
 backtrace_deps = [unwind_dep, dw_dep]
 if unwind_dep.found()
   cdata.set('HAVE_UNWIND', 1)
diff --git a/meson_options.txt b/meson_options.txt
index cd5bead..50445af 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,6 +20,7 @@ option('memory-alignment', type: 'combo',
 # Feature options
 option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
 option('libunwind', type : 'feature', value : 'auto', description : 'Use libunwind to generate backtraces')
+option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind')
 option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
 
 # Common feature options