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

gnu-config: Update, allowing hacks to be removed #40505

Merged
merged 3 commits into from May 14, 2018
Merged

gnu-config: Update, allowing hacks to be removed #40505

merged 3 commits into from May 14, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Back port of #40040. This is the only cross fix I'll ever attempt to back-port with a version bump, but I think its OK as the "program" being back ported is just two simple shell scripts, only used at build-time.

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.

@Ericson2314
linux stdenv: Update gnu-config on all non-x86
eebd455 
Not just Aarch64. Other non-x86 platforms might be old enough, but I am
about to update gnu-config to handle things better across the board.
@Ericson2314
gnu-config: Update to support ARM and 4 quardruples
29db817 
I recently upstreamed

 - https://git.savannah.gnu.org/cgit/config.git/commit/?id=50a0413a5ba9684aa9247444c60a5cea47c4435d
 - https://git.savannah.gnu.org/cgit/config.git/commit/?id=09df750b994963a47f7c450f74b7e3f8567a6355
@Ericson2314
Revert "Revert "gcc, binutils: Get rid of 32-bit ARM configure flag e…
f472dd7 
…xception""

And there's more reverts too. The previous commmit
d838afbc9376bdadb8c690eb00b425f3eeccdf2d to gnu-config finally solves
it!

This reverts commit 3ed545a.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: binutils, gnu-config

Partial log (click to expand)

these derivations will be built:
  /nix/store/35p48rf69wwg84cg9mrpvv0ncsk9nw09-gnu-config-2016-12-31.drv
building '/nix/store/35p48rf69wwg84cg9mrpvv0ncsk9nw09-gnu-config-2016-12-31.drv'...
/nix/store/cmxaqb5cbzy4jk26na842n6hy1s4yn19-binutils-wrapper-2.28.1
/nix/store/pca7x3smrbxk0n02bd7mlldr172iqfrl-gnu-config-2016-12-31

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: binutils, gnu-config

Partial log (click to expand)

copying path '/nix/store/0byiijfj8nzx4j2j13aisig7vinvfqgd-CF-osx-10.10.5' from 'https://cache.nixos.org'...
copying path '/nix/store/729lcb4xnwwj5agzc1a3azms5hwd66mq-llvm-5.0.2' from 'https://cache.nixos.org'...
copying path '/nix/store/fzixki6zkmy20iphspkriknmvv0rfcg7-cctools-binutils-darwin' from 'https://cache.nixos.org'...
copying path '/nix/store/dd5fdvyd7w0lxj697grlwf525j9hglqy-cctools-binutils-darwin-wrapper' from 'https://cache.nixos.org'...
copying path '/nix/store/jqn4674sg9lrnbsnw1fwlqw2m3kdac5v-clang-5.0.2' from 'https://cache.nixos.org'...
copying path '/nix/store/5h6z160698dngd6z8ll9av5z64d0hyk2-clang-wrapper-5.0.2' from 'https://cache.nixos.org'...
copying path '/nix/store/ac41mvv7gh14qshvxdsapg2l0l56dr4x-stdenv-darwin' from 'https://cache.nixos.org'...
building '/nix/store/f8yap9i2dy8fyxid9gfikqg3xjvg6l4f-gnu-config-2016-12-31.drv'...
/nix/store/dd5fdvyd7w0lxj697grlwf525j9hglqy-cctools-binutils-darwin-wrapper
/nix/store/cm1c41jsimlaqibxfm3pclk20rggxjg2-gnu-config-2016-12-31

@Ericson2314 Ericson2314 merged commit 1023285 into NixOS:staging-18.03 May 14, 2018
@Ericson2314 Ericson2314 deleted the gnu-config-arm branch May 14, 2018 15:47
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: binutils, gnu-config

Partial log (click to expand)

strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
stripping (with command strip and flags -S) in /nix/store/xmk20j11750c0n3zkc5xa7i4dzd182gr-findutils-4.6.0/libexec  /nix/store/xmk20j11750c0n3zkc5xa7i4dzd182gr-findutils-4.6.0/bin
checking for references to /build in /nix/store/xmk20j11750c0n3zkc5xa7i4dzd182gr-findutils-4.6.0...
shrinking RPATHs of ELF executables and libraries in /nix/store/0n8nwcvlsi4wlwr3gp399c77gajmjl53-findutils-4.6.0-info
strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
checking for references to /build in /nix/store/0n8nwcvlsi4wlwr3gp399c77gajmjl53-findutils-4.6.0-info...
building '/nix/store/4wmp12jkg3y9i7jhpakr5asywhwvghr8-stdenv.drv'...
building '/nix/store/vnzkp6kmba1xzqkjwx075jnmz0gavrad-gnu-config-2016-12-31.drv'...
/nix/store/bxzwj8fjyshgjb4c5s8cbkf8caqqrrlf-binutils-wrapper-2.28.1
/nix/store/sjpnf8dlrwf702amhnxjaggchasnskgd-gnu-config-2016-12-31

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
6.topic: stdenv Standard environment 10.rebuild-darwin: 11-100 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @GrahamcOfBorg @nixos-discourse