gmp: don't use uname to detect system features #51515
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
Mic92
reviewed
Dec 4, 2018
lopsided98
force-pushed
the
gmp-uname-purity
branch
from
80c1732
to
dbca5ce
Compare
|
I enabled it on all platforms and successfully built |
lopsided98
force-pushed
the
gmp-uname-purity
branch
from
dbca5ce
to
edc67b5
Compare
|
I also successfully built cross stdenv for |
|
@GrahamcOfBorg build gmp |
lopsided98
force-pushed
the
gmp-uname-purity
branch
from
edc67b5
to
7c04f95
Compare
lopsided98
requested review from
basvandijk,
Ericson2314,
FRidh,
infinisil,
matthewbauer,
nbp,
peti,
ryantm and
ttuegel
as code owners
lopsided98
force-pushed
the
gmp-uname-purity
branch
from
7c04f95
to
3e94847
Compare
|
Can this be merged, or at least have the build triggered again? The ofborg logs seem to not be available anymore, but the x86_64 failure is a timeout, and the darwin failure seems to be a problem with a dependency. |
|
@GrahamcOfBorg build gmp |
|
It timed out again on x86_64-linux, but x86_64-darwin succeeded this time, as well as aarch64-linux. |
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.
Motivation for this change
On 32-bit ARM, gmp is explicitly configured with an alternative way to autodetect the build platform to work around a bug in the default system detection. This has the side effect of making it impossible to build correctly for armv6l on an armv7l machine.
Things done
This PR replaces the
configfsf.guessscript withstdenv.buildPlatform.config. This makes the build more pure and also makes the derivation a little cleaner because we can useconfigureFlagsinstead of thepreConfigurescript.I split the change into two commits, the first which avoids a mass rebuild on architectures other than 32-bit ARM, and second which cleans up the derivation with a mass rebuild (removing the
preConfigureattribute).I would like to get the first commit into master, and the second into staging, but I'm not sure what the procedure is for that.
cc @peti @vrthra
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)