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.

Sign up for GitHub

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

Jump to bottom

darling-dmg: fix build with gcc7 #36686

Merged
merged 1 commit into from Mar 12, 2018
Merged

darling-dmg: fix build with gcc7 #36686

merged 1 commit into from Mar 12, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 9, 2018 •
edited

Motivation for this change

didn't build with gcc7

/cc ZHF #36453

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@pbogdan
Copy link
Member

pbogdan commented Mar 9, 2018

FYI there is an upstream patch available over at https://github.com/darlinghq/darling-dmg/commit/cbb0092264b5c5cf3e92d6c2de23f02d859ebf44.patch that we could grab (not included in any official release though).

@xeji
Copy link
Contributor Author

xeji commented Mar 9, 2018

Thanks, I'll give that a try.

@xeji xeji changed the title darling-dmg: use gcc6 to fix build [WIP] darling-dmg: use gcc6 to fix build Mar 9, 2018
@xeji
Copy link
Contributor Author

xeji commented Mar 9, 2018

@pbogdan - thanks again, the patch works. Using this instead of pinning to gcc6.

@xeji xeji changed the title [WIP] darling-dmg: use gcc6 to fix build darling-dmg: fix build with gcc7 Mar 9, 2018
@xeji
Copy link
Contributor Author

xeji commented Mar 10, 2018

@GrahamcOfBorg build darling-dmg

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

-- Installing: /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4/bin/darling-dmg
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4
shrinking /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4/bin/darling-dmg
shrinking /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4/lib/libdmg.so
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4/lib  /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4/bin
patching script interpreter paths in /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4
checking for references to /build in /nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4...
/nix/store/9l1bhnmxpdi7mil3w810q9i3v7gc9ayf-darling-dmg-1.0.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: darling-dmg

Partial log (click to expand)

-- Installing: /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4/bin/darling-dmg
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4
shrinking /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4/bin/darling-dmg
shrinking /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4/lib/libdmg.so
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4/lib  /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4/bin 
patching script interpreter paths in /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4
checking for references to /tmp/nix-build-darling-dmg-1.0.4.drv-0 in /nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4...
/nix/store/fmc5xq5ggmqzny78qdbgsmyym6irxnbr-darling-dmg-1.0.4

vcunat added a commit that referenced this pull request Mar 12, 2018
@vcunat
Merge #36686: darling-dmg: fix build with gcc7
580d00d 
(cherry picked from commit 1d968d1)
@vcunat vcunat merged commit 468c5f4 into NixOS:master Mar 12, 2018
vcunat added a commit that referenced this pull request Mar 12, 2018
@vcunat
Merge #36686: darling-dmg: fix build with gcc7
1d968d1
@xeji xeji deleted the darling-dmg branch March 12, 2018 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@xeji @pbogdan @GrahamcOfBorg @vcunat