nss: set -DNS_PTR_LE_32=1 if isILP32 #208698
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
I've run into a few packages that need an extra flag on platforms where `int` has more bits than `void*` does. I know of three such platforms: * [aarch64ilp32], used on both Linux and also on the [Apple Watch] * [x32], the x86 ILP32 ABI * [mips64n32], used on [Longsoon] and Cavium Octeon routers. This PR introduces a predicate so the package flags can be added in a generic way. [Apple Watch]: https://gist.github.com/woachk/943828f37c14563a607a26116435bf27#watch [mips64n32]: https://en.wikipedia.org/wiki/MIPS_architecture#Calling_conventions [Longsoon]: https://en.wikipedia.org/wiki/Loongson [x32]: https://en.wikipedia.org/wiki/X32_ABI
ghost
requested review from
ajs124,
lukegb,
mweinelt,
alyssais,
nbp,
Ericson2314 and
matthewbauer
as code owners
ghost
marked this pull request as draft
|
Hang on, this shouldn't be causing so many rebuilds. |
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
and removed
10.rebuild-darwin: 101-500
10.rebuild-linux: 501+
10.rebuild-linux: 1001-2500
labels
ghost
mentioned this pull request
13 tasks
ghost
marked this pull request as ready for review
|
Can you squash the two latest commits? |
A comment in RNG_RandomUpdate() (drdbg.c) says to add the -DNS_PTR_LE_32=1 flag on ILP32 platforms. Without this PR, pkgsCross.mips64el-linux-gnuabin32.nss fails to build. With this PR, it succeeds.
ghost
marked this pull request as draft
ghost
marked this pull request as ready for review
|
ghost
marked this pull request as draft
ghost
marked this pull request as ready for review
ajs124
pushed a commit
to helsinki-systems/nixpkgs
that referenced
this pull request
Jan 11, 2023
Nss has a lot of dependers, so subtle whitespace changes can cause mass rebuilds, like I did here: NixOS#208698 (comment) Let's use a list instead of concatenating individual strings in order to be more robust. This will cause a lot of rebuilds, but will prevent rebuilds in the future. Sending it this cleanup to staging because of that.
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.
Description of changes
A comment in RNG_RandomUpdate() (drdbg.c) says to add the
-DNS_PTR_LE_32=1flag on ILP32 platforms.Without this PR, pkgsCross.mips64el-linux-gnuabin32.nss fails to build. With this PR, it succeeds.
This PR includes the commit found in #208697
Things done
./result/bin/)