SDL2: Keep .a files on dontDisableStatic; don't move them to $dev; prune .la#72736
Merged
cpages merged 1 commit intoNixOS:stagingfrom Nov 10, 2019
Merged
SDL2: Keep .a files on dontDisableStatic; don't move them to $dev; prune .la#72736cpages merged 1 commit intoNixOS:stagingfrom
dontDisableStatic; don't move them to $dev; prune .la#72736cpages merged 1 commit intoNixOS:stagingfrom
Conversation
Contributor
Author
|
Relevant history of the What the |
ofborg
bot
added
10.rebuild-darwin: 101-500
Contributor
Author
|
|
nh2
force-pushed
the
nix-sdl2-static-fixes
branch
from
ffe81da to
f08b711
Compare
60 tasks
matthewbauer
reviewed
Nov 4, 2019
Member
There was a problem hiding this comment.
Shouldn't this file (and other .a) still be removed when dontDisableStatic is true? Otherwise we get .a files in the SDL closure.
Contributor
Author
There was a problem hiding this comment.
You are right.
It seems SDL2 does not quite respect --disable-static; it still generates libSDL2main.a and libSDL2_test.a.
I've force-pushed an else branch that deletes them.
It also generates libSDL2main.la and libSDL2_test.la which are prett useless given that the .a files they mention are nonexistent. Should I delete them, or do we not care?
Also, with what comand can I rebuild everything that depends on SDL2, so that I can check if anything used the libSDL2main.a that before was in the $dev output?
Contributor
There was a problem hiding this comment.
I don't see the 'else' branch to keep removing the .a libs. Your force push failed? Otherwise looks good to me
Contributor
Author
There was a problem hiding this comment.
Your force push failed?
Oops, you are right. Fixed now, sorry.
Contributor
Author
|
@GrahamcOfBorg eval |
Contributor
Author
|
@matthewbauer Good to go with the incorporated feedback? |
…prune .la. Most other packages don't move `.a` files to "$dev", and that is because it makes the pkg-config `.pc` file wrong (the `libdir` is the non-dev one). Keeping them in the main output makes static linking of SDL2 work. See added comment about pruning of `.la` files.
nh2
force-pushed
the
nix-sdl2-static-fixes
branch
from
f08b711 to
57908c1
Compare
Contributor
Author
|
The ofborg build times out on building GCC 8 after 1 hour. |
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
Most other packages don't move
.afiles to"$dev", and that is becauseit makes the pkg-config
.pcfile wrong (thelibdiris the non-dev one).Keeping them in the main output makes static linking of SDL2 work.
See added comment about pruning of
.lafiles.Tested in nh2/static-haskell-nix#65.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @cpages
FYI @matthewbauer