[cairo-commit] 2 commits - meson.build meson_options.txt

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Feb 23 11:33:47 UTC 2021


 meson.build       |   10 ++++------
 meson_options.txt |    2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d6c1787ac1a705f129f3d56b6058f02129535796
Merge: 9e84988f4 e0cf7b869
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Feb 23 11:33:45 2021 +0000

    Merge branch 'meson-symbol-lookup-option' into 'master'
    
    meson: add symbol-lookup option to allow disabling bfd/libiberty usage
    
    See merge request cairo/cairo!127

commit e0cf7b869fb1c6b73cf4a9aad2fc8aea4ff1f6ee
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Feb 23 10:33:23 2021 +0000

    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

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')


More information about the cairo-commit mailing list