Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R: reenable stackprotector on aarch64-darwin #189758

Merged
merged 1 commit into from
Sep 9, 2022

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Sep 4, 2022

The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC (in #186477). This reverts the change in #158992, which fixed #158730.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.05 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

The original error that required disabling the stack protector on
aarch64-darwin has been fixed in GCC.
@tjni tjni requested a review from jbedo as a code owner September 4, 2022 18:35
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Sep 4, 2022
@tjni
Copy link
Contributor Author

tjni commented Sep 4, 2022

Result of nixpkgs-review pr 189758 run on aarch64-darwin 1

1 package marked as broken and skipped:
  • ocamlPackages.ocaml-r
8 packages built:
  • R
  • postgresql11Packages.plr
  • postgresql12Packages.plr
  • postgresql13Packages.plr
  • postgresql14Packages.plr
  • python310Packages.rpy2
  • python39Packages.rpy2
  • rWrapper

@collares
Copy link
Member

collares commented Sep 4, 2022

cc @ConnorBaker

@SuperSandro2000 SuperSandro2000 merged commit 65c1313 into NixOS:master Sep 9, 2022
@tjni tjni deleted the r-stackprotector branch September 9, 2022 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

R: fails on aarch64-darwin with BLAS compile error
3 participants