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

guile: Backport cross fixes #40445

Merged
merged 5 commits into from May 13, 2018
Merged

guile: Backport cross fixes #40445

merged 5 commits into from May 13, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Where noninvasive, I like to port cross fixes back to the 18.03. Also I have some further changes for both which depend on these.

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.

shlevy and others added 5 commits May 13, 2018 11:36
@shlevy @Ericson2314
Guile: Fix cross-compilation
0fcad04 
(cherry picked from commit f79fa77)
@Ericson2314
guile: Fix cross more, including 1.8
8415682 
(cherry picked from commit 76bc1d3)
@mdorman @Ericson2314
guile-1.8: Fix and clean up libtool propagation fixes
9a4cc93 
Fixes NixOS#37548

(cherry picked from commit 2119041)
@mdorman @Ericson2314
guile: Fix and clean up libtool propagation fixes
d77dab3 
Fixes NixOS#37548

(cherry picked from commit 7298421)
@Ericson2314
guile: Remove old crossAttrs
130a0cb 
We fixed the linker issue with propagated dependencies.

(cherry picked from commit 515ca1a)
@Ericson2314 Ericson2314 changed the title Guile: Backport cross fixes guile: Backport cross fixes May 13, 2018
@Ericson2314 Ericson2314 mentioned this pull request May 13, 2018
Merged
8 tasks
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: guile

Partial log (click to expand)

cannot find section .dynstr
shrinking RPATHs of ELF executables and libraries in /nix/store/1la1j5p0wz4qd55sngs50h07zrs53hyb-guile-2.2.3-dev
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1la1j5p0wz4qd55sngs50h07zrs53hyb-guile-2.2.3-dev/lib
patching script interpreter paths in /nix/store/1la1j5p0wz4qd55sngs50h07zrs53hyb-guile-2.2.3-dev
checking for references to /build in /nix/store/1la1j5p0wz4qd55sngs50h07zrs53hyb-guile-2.2.3-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/kb9q389sn0s5zf38b9nh7n7wg4akqjhv-guile-2.2.3-info
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/kb9q389sn0s5zf38b9nh7n7wg4akqjhv-guile-2.2.3-info
checking for references to /build in /nix/store/kb9q389sn0s5zf38b9nh7n7wg4akqjhv-guile-2.2.3-info...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: guile

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/2wi8ml3il160hfjkrsbk9309mc3nfn01-guile-2.2.3-dev
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/2wi8ml3il160hfjkrsbk9309mc3nfn01-guile-2.2.3-dev/lib
patching script interpreter paths in /nix/store/2wi8ml3il160hfjkrsbk9309mc3nfn01-guile-2.2.3-dev
checking for references to /build in /nix/store/2wi8ml3il160hfjkrsbk9309mc3nfn01-guile-2.2.3-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/c07rwcki6366xb0yjk2yj8p6z4gh9mka-guile-2.2.3-info
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/c07rwcki6366xb0yjk2yj8p6z4gh9mka-guile-2.2.3-info
checking for references to /build in /nix/store/c07rwcki6366xb0yjk2yj8p6z4gh9mka-guile-2.2.3-info...
/nix/store/pklgj3zc6f19am70izcyfgwl88xhl6l1-guile-2.2.3

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: guile

Partial log (click to expand)

patching script interpreter paths in /nix/store/6g8r311qbk354zjy77cbsasrbzsclysb-guile-2.2.3
/nix/store/6g8r311qbk354zjy77cbsasrbzsclysb-guile-2.2.3/bin/.guile-snarf-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/h6815iv0gcn7hq1nk6qc1rzsv7x9gcz7-bash-4.4-p12/bin/sh"
/nix/store/6g8r311qbk354zjy77cbsasrbzsclysb-guile-2.2.3/bin/guild: interpreter directive changed from "/bin/sh" to "/nix/store/h6815iv0gcn7hq1nk6qc1rzsv7x9gcz7-bash-4.4-p12/bin/sh"
/nix/store/6g8r311qbk354zjy77cbsasrbzsclysb-guile-2.2.3/bin/guile-config: interpreter directive changed from "/bin/sh" to "/nix/store/h6815iv0gcn7hq1nk6qc1rzsv7x9gcz7-bash-4.4-p12/bin/sh"
strip is /nix/store/fzixki6zkmy20iphspkriknmvv0rfcg7-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/dd9icm49ymhh3lq46dca1znsp99qz09r-guile-2.2.3-dev/lib
patching script interpreter paths in /nix/store/dd9icm49ymhh3lq46dca1znsp99qz09r-guile-2.2.3-dev
strip is /nix/store/fzixki6zkmy20iphspkriknmvv0rfcg7-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/qz35d7nm1izc5kc1fms7sahib95ri6f2-guile-2.2.3-info
/nix/store/6g8r311qbk354zjy77cbsasrbzsclysb-guile-2.2.3

@Ericson2314 Ericson2314 merged commit f06f2f4 into NixOS:staging-18.03 May 13, 2018
@Ericson2314 Ericson2314 deleted the guile-backport branch May 13, 2018 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ericson2314 @GrahamcOfBorg @shlevy @mdorman