meson: append install_rpath via patchelf#31436
Closed
lukateras wants to merge 1 commit intoNixOS:masterfrom
Closed
meson: append install_rpath via patchelf#31436lukateras wants to merge 1 commit intoNixOS:masterfrom
lukateras wants to merge 1 commit intoNixOS:masterfrom
Conversation
8 tasks
jtojnar
reviewed
Nov 9, 2017
Member
There was a problem hiding this comment.
indentation mismatch (tabs vs spaces)
Member
Author
There was a problem hiding this comment.
Can't get Emacs to indent shell scripts properly...
lukateras
force-pushed
the
meson/patchelf
branch
from
04aa987 to
fa29eff
Compare
This is based on Jan Tojnar's work in NixOS#31228. When patchelf has to grow rpath beyond original capacity, it sets dontStrip, to work around NixOS/patchelf#10.
lukateras
force-pushed
the
meson/patchelf
branch
from
fa29eff to
aebc2b8
Compare
lukateras
changed the title
orivej
reviewed
Nov 11, 2017
| old_rpath = _patchelf('--print-rpath', self.bfile) | ||
| if old_rpath: | ||
| new_rpath = old_rpath + b':' + bytes(install_rpath, 'utf-8') | ||
| if len(old_rpath) < len(new_rpath): |
8 tasks
jtojnar
reviewed
Nov 11, 2017
| sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; | ||
| }; | ||
|
|
||
| patchPhase = "cat ${./depfixer_patchelf.py} >> mesonbuild/scripts/depfixer.py"; |
Member
There was a problem hiding this comment.
This should probably be in postPatch in case we need to add patches in the future.
Member
|
For the reference, I propose yet another solution in #31222 (comment) |
Member
Author
|
Closing in favor of #31222 (comment). |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation for this change
This is based on @jtojnar's work in #31228. When
patchelfhas to grow rpath beyond original capacity, it setsdontStrip, to work around NixOS/patchelf#10.Fixes #31222. Currently in the process of rebuilding stuff with patched
meson.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)