Skip to content

Comments

uim: pull upstream fix for -fno-common toolchains#178538

Merged
trofi merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-uim
Jun 25, 2022
Merged

uim: pull upstream fix for -fno-common toolchains#178538
trofi merged 1 commit intoNixOS:masterfrom
trofi:fix-fno-common-for-uim

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jun 22, 2022 •
edited
Loading

Without the change build fails on upstream gcc-10 as:

ld: .libs/mach_dep.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: multiple definition of
  `GCROOTS_jmp_buf'; .libs/mark.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: 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 trofi mentioned this pull request Jun 22, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from oxij June 22, 2022 07:04
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 22, 2022
@Tungsten842
Copy link
Member

Tungsten842 commented Jun 22, 2022

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

2 packages built:
  • mlterm
  • uim

@trofi
uim: pull upstream fix for -fno-common toolchains
a60c23a 
Without the change build fails on upstream gcc-10 as:

    ld: .libs/mach_dep.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: multiple definition of
      `GCROOTS_jmp_buf'; .libs/mark.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: first defined here
@trofi trofi force-pushed the fix-fno-common-for-uim branch from b05f34a to a60c23a Compare June 24, 2022 07:14
@trofi trofi merged commit c48e4d4 into NixOS:master Jun 25, 2022
@trofi trofi deleted the fix-fno-common-for-uim branch June 25, 2022 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oxij oxij Awaiting requested review from oxij

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trofi @Tungsten842