-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Glib: Make libelf dependency optional #2925
Merged
conan-center-bot
merged 14 commits into
conan-io:master
from
Erlkoenig90:glib-optional-libelf
Jan 16, 2021
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
acfcb4d
Glib: Make libelf dependency optional
Erlkoenig90 dba4fc4
Glib: Use libelf patch only for vesions >= 2.65.1
Erlkoenig90 0163f69
glib: delete with_elf option if < 2.65.1
SpaceIm a674bc4
glib: move requires in requirements method
SpaceIm f2d805e
glib: fix loop in patches
SpaceIm ed4de69
glib: delete with_elf option in configure
SpaceIm 1d66f85
Merge pull request #1 from SpaceIm/fix/glib-optional-elf
Erlkoenig90 4df9b54
For #2925: Merge master. Apply with_elf as meson option for GLib vers…
Erlkoenig90 b866165
Merge branch 'glib-optional-libelf' of github.com:Erlkoenig90/conan-c…
Erlkoenig90 43a8c8c
Merge branch 'master' into glib-optional-libelf
Erlkoenig90 c59d4c1
Update recipes/glib/all/conanfile.py
Erlkoenig90 a57403f
Update recipes/glib/all/conanfile.py
Erlkoenig90 979751b
Glib: Reverted get_safe on with_elf
Erlkoenig90 10fad71
Glib: Unneccessary whitespace modification removed
Erlkoenig90 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff -ur a/gio/meson.build b/gio/meson.build | ||
--- a/gio/meson.build 2020-09-10 12:42:41.546684000 +0200 | ||
+++ b/gio/meson.build 2020-09-15 10:45:38.897447913 +0200 | ||
@@ -874,14 +874,14 @@ | ||
|
||
# Dependencies used by executables below | ||
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() | ||
have_libelf = true | ||
else | ||
# This fallback is necessary on *BSD. elfutils isn't the only libelf | ||
# implementation, and *BSD usually includes their own libelf as a system | ||
# 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 = have_libelf and cc.has_function('elf_begin', dependencies : libelf) | ||
have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf) | ||
diff -ur a/meson_options.txt b/meson_options.txt | ||
--- a/meson_options.txt 2020-09-10 12:42:41.673685600 +0200 | ||
+++ b/meson_options.txt 2020-09-15 10:44:18.049745441 +0200 | ||
@@ -111,3 +111,8 @@ | ||
value : true, | ||
yield : true, | ||
description : 'Enable GLib checks such as API guards (see docs/macros.txt)') | ||
+ | ||
+option('libelf', | ||
+ type : 'feature', | ||
+ value : 'auto', | ||
+ description : 'Use libelf') |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made the patch available since 2.65.1 because it works from there. On 2.65.0 we keep the old behaviour.