rapidcheck: Build shared/static following defaults #269064
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
CMake defaults to static which is not what we want. It is especially dangerous because this library has global variables --- embedding multiple copies in downstream shared objects used by the same final executable will cause problems.
Ericson2314
added a commit
to obsidiansystems/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today).
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
github-actions bot
pushed a commit
to NixOS/nix
that referenced
this pull request
Nov 22, 2023
NixOS/nixpkgs#269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 4613156)
|
The Nix PR and backports are merged so this is good to go. (As new releases are cut, both from |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-23.05
git worktree add -d .worktree/backport-269064-to-release-23.05 origin/release-23.05
cd .worktree/backport-269064-to-release-23.05
git switch --create backport-269064-to-release-23.05
git cherry-pick -x b2b9257186c568bae937c09b36067cd6b3448f2a 98bdc2b3bb7ac42173cbe2033b91f849307a4737 |
|
Successfully created backport PR for |
1 task
13 tasks
| @@ -113,6 +113,13 @@ let | |||
| hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; | |||
| }; | |||
|
|
|||
| patch-rapidcheck-shared = fetchpatch2 { | |||
There was a problem hiding this comment.
FYI fetchpatch2 is only really required when renaming files ATM
There was a problem hiding this comment.
oh OK my bad. I just assumed it was just the "new and improved version" which should be used by default.
There was a problem hiding this comment.
I don't think it really matters, just that the normalisation is just slightly different and has a few bug fixes so not all hashes are compatible.
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
CMake defaults to static which is not what we want. It is especially dangerous because this library has global variables --- embedding multiple copies in downstream shared objects used by the same final executable will cause problems.
Second commit fixes Nix by backporting NixOS/nix#9431
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Priorities
Add a 👍 reaction to pull requests you find important.