mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

libdw support is optional

Browse source 
This was no longer optional, leading to deadcode. This regression was
found trying to fix the unwind variant in cerbero.
This commit is contained in:
Nicolas Dufresne 2018-11-23 21:22:21 -05:00
parent 5dba53a6f9
commit e501e2f5c9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -347,7 +347,7 @@ endif
backtrace_deps = [] backtrace_deps = []
unwind_dep = dependency('libunwind', required : get_option('libunwind')) 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] backtrace_deps = [unwind_dep, dw_dep]
if unwind_dep.found() if unwind_dep.found()
cdata.set('HAVE_UNWIND', 1) cdata.set('HAVE_UNWIND', 1)

1
meson_options.txt
View file

@ -20,6 +20,7 @@ option('memory-alignment', type: 'combo',
# Feature options # Feature options
option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
option('libunwind', type : 'feature', value : 'auto', description : 'Use libunwind to generate backtraces') 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') option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files')
# Common feature options # Common feature options