libredirect: Add support for Darwin #50246
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
The library can be used also on Darwin using it like this:
NIX_REDIRECTS='foo=bar' \
DYLD_INSERT_LIBRARIES=${libredirect}/lib/libredirect.so \
DYLD_FORCE_FLAT_NAMESPACE=1 \
some_program
So let's actually not hardcade gcc and add Darwin to meta.platforms.
No other changes seem to be required.
Signed-off-by: aszlig <aszlig@nix.build>
GrahamcOfBorg
added
6.topic: darwin
|
Success on aarch64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
@GrahamcOfBorg build libredirect |
|
Success on aarch64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
zimbatm
reviewed
Nov 12, 2018
This is to make sure we get the correct shared library suffix of the target platform. While for example on Darwin it would even work with the hardcoded .so prefix it's IMHO a bit nicer to have the actual native extension. Signed-off-by: aszlig <aszlig@nix.build>
This is just a sanity check on whether the library correctly wraps the
syscalls and it's using the "true" executable for posix_spawn() and
execv().
The installCheckPhase is not executed if we are cross-compiling, so this
shouldn't break cross-compilation.
One thing I'm not actually sure is whether ${coreutils}/bin/true is
universally available on all the platforms, nor whether all the
functions we use in the test are available, but we can still fix that
after we've found out about that.
Signed-off-by: aszlig <aszlig@nix.build>
aszlig
force-pushed
the
libredirect-darwin
branch
from
29579fa
to
34dd1c6
Compare
|
Success on x86_64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: libredirect Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: libredirect Partial log (click to expand)
|
aszlig
added a commit
to aszlig/nixpkgs
that referenced
this pull request
Nov 12, 2018
Pull request NixOS#50246 was merged a bit too quickly and it was supposed to fix libredirect on Darwin. However it still fails on Darwin because I was using ofborg to check Darwin builds as I don't have Apple hardware. Providing a symbol for stat shouldn't hurt on GNU/Linux but might work on Darwin, because it probably doesn't have __xstat*() but might have a stat() symbol. Signed-off-by: aszlig <aszlig@nix.build>
aszlig
added a commit
that referenced
this pull request
Nov 12, 2018
Pull request #50246 was merged a bit too quickly and it was supposed to fix libredirect on Darwin. However it still failed on Darwin and this was missed by the person merging the pull request. The reason this was failing was that there is no __xstat* on Darwin. So I'm adding a wrapper for stat() as well as it works on Darwin and it still doesn't hurt on GNU/Linux. Signed-off-by: aszlig <aszlig@nix.build> Cc: @edolstra, @zimbatm
|
I am going to back-port this to 18.09 unless there are objections |
|
The |
zimbatm
added a commit
to zimbatm/nixpkgs
that referenced
this pull request
Nov 13, 2018
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.
The library can be used also on Darwin using it like this:
So let's actually not hardcade gcc and add Darwin to
meta.platforms.No other changes seem to be required.
Cc: @zimbatm, @edolstra, @dezgeg, @copumpkin