luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 04:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'optdeps' into 'master'

Browse Source 
Make libelf dependency optional via meson feature

See merge request GNOME/glib!1650
This commit is contained in:
Philip Withnall 2020-10-01 13:47:36 +00:00
commit 854abcd1af
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/meson.build
View File

@ -874,14 +874,14 @@ endif
# Dependencies used by executables below # Dependencies used by executables below
have_libelf = false have_libelf = false
libelf = dependency('libelf', version : '>= 0.8.12', required : false) libelf = dependency('libelf', version : '>= 0.8.12', required : get_option ('libelf'))
if libelf.found() if libelf.found()
have_libelf = true have_libelf = true
else else
# This fallback is necessary on *BSD. elfutils isn't the only libelf # This fallback is necessary on *BSD. elfutils isn't the only libelf
# implementation, and *BSD usually includes their own libelf as a system # implementation, and *BSD usually includes their own libelf as a system
# library which doesn't have a corresponding .pc file. # library which doesn't have a corresponding .pc file.
libelf = cc.find_library('elf', required : false) libelf = cc.find_library('elf', required : get_option ('libelf'))
have_libelf = libelf.found() have_libelf = libelf.found()
have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf) have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf)
have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf) have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf)

5
meson_options.txt
View File

@ -111,3 +111,8 @@ option('glib_checks',
value : true, value : true,
yield : true, yield : true,
description : 'Enable GLib checks such as API guards (see docs/macros.txt)') description : 'Enable GLib checks such as API guards (see docs/macros.txt)')
option('libelf',
type : 'feature',
value : 'auto',
description : 'Enable support for listing and extracting from ELF resource files with gresource tool')