diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-02-23 10:33:23 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-02-23 10:35:42 +0000 |
| commit | e0cf7b869fb1c6b73cf4a9aad2fc8aea4ff1f6ee (patch) | |
| tree | 76939c9ed574c8318241e5c15e95bbdf795aa399 | |
| parent | 9e84988f411b78786d8da2f8cb013e80fa7a98e0 (diff) | |
| download | cairo-e0cf7b869fb1c6b73cf4a9aad2fc8aea4ff1f6ee.tar.gz | |
meson: add symbol-lookup option to allow disabling bfd/libiberty usage
Can be used to workaround build issues caused by changes
in the bfd API until those have been resolved.
https://gitlab.freedesktop.org/cairo/cairo/-/issues/460
https://gitlab.freedesktop.org/cairo/cairo/-/issues/391
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index fe7757b1f..5cbeda913 100644 --- a/meson.build +++ b/meson.build @@ -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 diff --git a/meson_options.txt b/meson_options.txt index 5cafe8bda..2b4b46f7b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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') |