Update depfixer to fix rpaths also on OSX. #3356
Merged
Conversation
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
mesonbuild/scripts/depfixer.py
Outdated
| @@ -337,19 +338,52 @@ def remove_rpath_entry(self, entrynum): | |||
| entry.write(self.bf) | |||
| return None | |||
|
|
|||
| def fix_elf(fname, new_rpath): | |||
| with Elf(fname) as e: | |||
| if len(args) == 1: | |||
There was a problem hiding this comment.
[Flake8]
[F821] undefined name 'args'
textshell
reviewed
Apr 6, 2018
mesonbuild/scripts/depfixer.py
Outdated
| fix_elf(args) | ||
| return 0 | ||
| except Exception: | ||
| pass |
There was a problem hiding this comment.
Can we detect which fixer to use in a way that does not hide random unrelated exceptions?
| new_rpath = args[1] | ||
| e.fix_rpath(new_rpath) | ||
| return 0 | ||
| fname = args[0] |
There was a problem hiding this comment.
[Flake8]
[F841] local variable 'fname' is assigned to but never used
10 tasks
10 tasks
iMichka
added a commit
to iMichka/homebrew-core
that referenced
this pull request
Aug 24, 2019
meson-internal was introduced in Homebrew#25667 A patch was proposed upstream in mesonbuild/meson#2577, but never merged. It looks like the issues were fixed by mesonbuild/meson#3555 mesonbuild/meson#3691 mesonbuild/meson#3356 Now that we are one year later, and things have settled down, try to use meson everywhere and drop meson-internal, which is outdated.
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.