Skip to content

treewide: drop libatomic workaround for riscv#274827

Merged
NickCao merged 7 commits intoNixOS:stagingfrom
NickCao:latomic
Dec 18, 2023
Merged

treewide: drop libatomic workaround for riscv#274827
NickCao merged 7 commits intoNixOS:stagingfrom
NickCao:latomic

Conversation

@NickCao
Copy link
Member

@NickCao NickCao commented Dec 16, 2023 •
edited
Loading

Description of changes

Now that we are using gcc13 by default, the workaround is no longer required.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@NickCao NickCao mentioned this pull request Dec 16, 2023
Closed
21 tasks
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 17, 2023
@NickCao
Copy link
Member Author

NickCao commented Dec 17, 2023

Tested nix build .#pkgsCross.riscv64.numactl .#pkgsCross.riscv64.zstd .#pkgsCross.riscv64.glslang .#pkgsCross.riscv64.aws-sdk-cpp .#pkgsCross.riscv64.cmake .#pkgsCross.riscv64.libjxl, but not .#pkgsCross.riscv64.mariadb due to dependency failure.

@NickCao NickCao marked this pull request as ready for review December 17, 2023 01:36
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 17, 2023
@NickCao NickCao requested a review from fgaz December 17, 2023 14:38
fgaz
fgaz approved these changes Dec 17, 2023
View reviewed changes
Copy link
Member

@fgaz fgaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but I cannot test it with buildPlatform=riscv64-linux because gcc 13 is broken https://matrix.to/#/%23riscv%3Anixos.org/%242XpMACcsFmOqSrrZAqtXvFAC8aXvjGU1hDmx9P5ZghE?via=nixos.org&via=matrix.org&via=nixos.dev

@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Dec 17, 2023
@NickCao NickCao mentioned this pull request Dec 18, 2023
Merged
13 tasks
@NickCao NickCao merged commit 7ed4d83 into NixOS:staging Dec 18, 2023
@NickCao NickCao deleted the latomic branch December 18, 2023 19:23
@fgaz fgaz added the 6.topic: riscv64 RISC-V is an open standard instruction set architecture label Mar 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fgaz fgaz fgaz approved these changes

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: riscv64 RISC-V is an open standard instruction set architecture 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@NickCao @fgaz @delroth