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

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

Merged
merged 1 commit into from Jun 25, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jun 22, 2022

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.

@Tungsten842
Copy link
Member

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

2 packages built:
  • mlterm
  • uim

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 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants