Skip to content

Comments

decoder: pull patch pending upstream inclusion for -fno-common toolch…#180820

Merged
Artturin merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-decoder
Jul 9, 2022
Merged

decoder: pull patch pending upstream inclusion for -fno-common toolch…#180820
Artturin merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-decoder

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jul 9, 2022 •
edited
Loading

…ains

Without the change build fails on staging as:

ld: decoder.o:(.bss.usageScreen+0x0): multiple definition of
  `usageScreen'; errors.o:(.bss.usageScreen+0x0): first defined here
Description of changes
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.

@trofi
decoder: pull patch pending upstream inclusion for -fno-common toolch…
b55d83f 
…ains

Without the change build fails on `staging` as:

    ld: decoder.o:(.bss.usageScreen+0x0): multiple definition of
      `usageScreen'; errors.o:(.bss.usageScreen+0x0): first defined here
@trofi trofi requested a review from Luflosi July 9, 2022 07:19
@trofi trofi mentioned this pull request Jul 9, 2022
Merged
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 9, 2022
@Tungsten842
Copy link
Member

Tungsten842 commented Jul 9, 2022

Result of nixpkgs-review pr 180820 run on x86_64-linux 1

1 package built:
  • decoder

@Atemu
Copy link
Member

Atemu commented Jul 9, 2022

Should probably target staging?

@r-burns
Copy link
Contributor

r-burns commented Jul 9, 2022

It'll get automerged into staging so I think either way is fine?

@trofi
Copy link
Contributor Author

trofi commented Jul 9, 2022

Yeah, I'd prefer master update to avoid possible conflicts with future changes against master. Like possible package version updates.

@Artturin Artturin merged commit a8e40c0 into NixOS:master Jul 9, 2022
@trofi trofi deleted the fix-fno-common-for-decoder branch July 9, 2022 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Luflosi Luflosi Awaiting requested review from Luflosi

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@trofi @Tungsten842 @Atemu @r-burns @Artturin