Skip to content

lsof: fix -fno-common builds on darwin - #181553

Merged
K900 merged 1 commit into
NixOS:staging-nextfrom
jiegec:lsof
Jul 15, 2022
Merged

lsof: fix -fno-common builds on darwin#181553
K900 merged 1 commit into
NixOS:staging-nextfrom
jiegec:lsof

Conversation

@jiegec

@jiegec jiegec commented Jul 15, 2022 •
edited
Loading

Copy link
Copy Markdown
Member
Description of changes

Two upstream commits are applied for -fno-common toolchains.

See pr #179945 for discussion.

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.

@jiegec
lsof: fix -fno-common builds on darwin
0285b6f 
Two upstream commits are applied for -fno-common toolchains.

Signed-off-by: Jiajie Chen <c@jia.je>
@ofborg ofborg Bot added the 6.topic: darwin Running or building packages on Darwin label Jul 15, 2022
@jiegec
jiegec requested a review from trofi July 15, 2022 02:39
@ofborg
ofborg Bot requested a review from dezgeg July 15, 2022 02:49
@ofborg ofborg Bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jul 15, 2022
@K900

K900 commented Jul 15, 2022

Copy link
Copy Markdown
Contributor

Seems to build now. Let's see how it goes.

@K900
K900 merged commit 5946c56 into NixOS:staging-next Jul 15, 2022
@jiegec
jiegec deleted the lsof branch July 15, 2022 05:51
trofi
trofi reviewed Jul 15, 2022
View reviewed changes

@trofi trofi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Perfect. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dezgeg dezgeg Awaiting requested review from dezgeg
1 more reviewer
@trofi trofi trofi left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jiegec @K900 @trofi