fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-08 13:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'meson-symbol-lookup-option' into 'master'

Browse source 
meson: add symbol-lookup option to allow disabling bfd/libiberty usage

See merge request cairo/cairo!127
This commit is contained in:
Uli Schlachter 2021-02-23 11:33:45 +00:00
commit d6c1787ac1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -674,13 +674,11 @@ if zlib_dep.found() and png_dep.found()
endif
# Untested, libiberty.h is in a libiberty subfolder for me
# FIXME: automagic
bfd_dep = cc.find_library('bfd', required: false)
# Also, the bfd API seems to have changed at some point
bfd_dep = cc.find_library('bfd', has_headers: ['bfd.h', 'libiberty.h'], required: get_option('symbol-lookup'))
if bfd_dep.found() and cc.has_function('bfd_openr', dependencies: [bfd_dep])
if cc.has_header('libiberty.h')
conf.set('HAVE_BFD', 1)
deps += [bfd_dep]
endif
conf.set('HAVE_BFD', 1)
deps += [bfd_dep]
endif
# Untested, see above

2
meson_options.txt
View file

@ -30,6 +30,8 @@ option('gtk2-utils', type : 'feature', value : 'disabled')
# Misc deps
option('glib', type : 'feature', value : 'auto')
option('spectre', type : 'feature', value : 'auto')
option('symbol-lookup', type: 'feature', value : 'auto',
description: 'Symbol lookup in debug utils via binutils/bfd')
# FIXME: implement these to avoid automagic
#option('egl', type : 'feature', value : 'auto')