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

android sdk, libibert, libbfd: Clean ups #35441

Merged
merged 3 commits into from Feb 24, 2018
Merged

android sdk, libibert, libbfd: Clean ups #35441

merged 3 commits into from Feb 24, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Misc cross / conditional code quality code cleanups.

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.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

�[31;1merror:�[0m while evaluating the attribute 'buildInputs' of the derivation 'openjdk-8u172b02' at �[1m/var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
while evaluating the attribute 'buildCommand' of the derivation 'openjdk-bootstrap' at �[1m/var/lib/gc-of-borg/nix-test-rs-3/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-3/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
No bootstrap for system

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

these paths will be fetched (1.68 MiB download, 6.83 MiB unpacked):
  /nix/store/bal8pnpkr6y8xh7qh6hjkvdk1xfqvffd-libiberty-7.3.0
  /nix/store/sjz6bcndhrfdsjlya0hm3xyg2zxlr27d-libbfd-2.28.1
copying path '/nix/store/bal8pnpkr6y8xh7qh6hjkvdk1xfqvffd-libiberty-7.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/sjz6bcndhrfdsjlya0hm3xyg2zxlr27d-libbfd-2.28.1' from 'https://cache.nixos.org'...
/nix/store/sjz6bcndhrfdsjlya0hm3xyg2zxlr27d-libbfd-2.28.1
/nix/store/bal8pnpkr6y8xh7qh6hjkvdk1xfqvffd-libiberty-7.3.0
/nix/store/qp0qsl6ls59dcaqip2b2cj7mv6pprsq1-zulu1.8.0_121-8.20.0.5

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/1jcy4xhpwsv4a08sxa0s70sn4lfz6lnm-openjdk-8u172b02-jre/lib  /nix/store/1jcy4xhpwsv4a08sxa0s70sn4lfz6lnm-openjdk-8u172b02-jre/bin 
patching script interpreter paths in /nix/store/1jcy4xhpwsv4a08sxa0s70sn4lfz6lnm-openjdk-8u172b02-jre
checking for references to /tmp/nix-build-openjdk-8u172b02.drv-0 in /nix/store/1jcy4xhpwsv4a08sxa0s70sn4lfz6lnm-openjdk-8u172b02-jre...
not an ELF executable
not an ELF executable
not an ELF executable
/nix/store/37608ics5q1f5r8kj0h1m92c4gwyryls-libbfd-2.28.1
/nix/store/h50wjij22d791im48sqhmzbpf8zmf9fc-libiberty-7.3.0
/nix/store/z809g4r05wha5cidcny9r96z6vl5c1ji-openjdk-8u172b02

Ericson2314
Ericson2314 commented Feb 24, 2018
View reviewed changes
pkgs/development/compilers/openjdk/bootstrap.nix Outdated
done

find $out -name \*.so\* | while read lib; do
patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true
patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this OK?

@Ericson2314
libiberty, libbfd: Make hash less fickle
1c00a8a 
These shouldn't respond to targetPlatform, but previously did. The
reason is somewhat complex: they would rely on the sources of gcc and
binutils, respectively, which *do* depend on the target platform.
Obviously the source is the same in all cases, but when those packages
are no longer preserved from bootstrapping stages their `src` attributes
use a different fetchurl resulting in a changed hash.
@Ericson2314
androidenv: Clean up whitespace
fe5ae8b
@Ericson2314
androidenv: Better platform conditionals
7748972
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/37608ics5q1f5r8kj0h1m92c4gwyryls-libbfd-2.28.1
/nix/store/h50wjij22d791im48sqhmzbpf8zmf9fc-libiberty-7.3.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

these paths will be fetched (1.61 MiB download, 8.17 MiB unpacked):
  /nix/store/damgva2pbc09bq0g8k31gzmgazb02h43-libiberty-7.3.0
  /nix/store/xblyhsi48w4hbjpjxs8cbkqd0l2xq5kv-libbfd-2.28.1
copying path '/nix/store/damgva2pbc09bq0g8k31gzmgazb02h43-libiberty-7.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/xblyhsi48w4hbjpjxs8cbkqd0l2xq5kv-libbfd-2.28.1' from 'https://cache.nixos.org'...
/nix/store/xblyhsi48w4hbjpjxs8cbkqd0l2xq5kv-libbfd-2.28.1
/nix/store/damgva2pbc09bq0g8k31gzmgazb02h43-libiberty-7.3.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

copying path '/nix/store/bal8pnpkr6y8xh7qh6hjkvdk1xfqvffd-libiberty-7.3.0' from 'https://cache.nixos.org'...
copying path '/nix/store/lvbg3qxa84bck05k425mj5n4hxx2n60n-Libsystem-osx-10.11.6' from 'https://cache.nixos.org'...
copying path '/nix/store/kdr62qhm6biz0fqgnrp1l8hmm9myxi9r-libc++abi-5.0.1' from 'https://cache.nixos.org'...
copying path '/nix/store/34lknhw7spc50gvqq9ghmfhm57hh8762-zlib-1.2.11' from 'https://cache.nixos.org'...
copying path '/nix/store/j6ifwrr83k1c5nmjfx1p63nydpqsbqd6-libc++-5.0.1' from 'https://cache.nixos.org'...
copying path '/nix/store/w15602rcvzx449klj17mckhyddbyvcml-ICU-osx-10.10.5' from 'https://cache.nixos.org'...
copying path '/nix/store/g94jv2hb0sadznj8dy39vxdvp6cj35z5-CF-osx-10.10.5' from 'https://cache.nixos.org'...
copying path '/nix/store/sjz6bcndhrfdsjlya0hm3xyg2zxlr27d-libbfd-2.28.1' from 'https://cache.nixos.org'...
/nix/store/sjz6bcndhrfdsjlya0hm3xyg2zxlr27d-libbfd-2.28.1
/nix/store/bal8pnpkr6y8xh7qh6hjkvdk1xfqvffd-libiberty-7.3.0

@Ericson2314 Ericson2314 changed the title android sdk, openjdk, libibert, libbfd: Clean ups android sdk, libibert, libbfd: Clean ups Feb 24, 2018
@Ericson2314 Ericson2314 merged commit 30f171d into NixOS:master Feb 24, 2018
@Ericson2314 Ericson2314 deleted the android-clean branch February 24, 2018 07:29
@Ericson2314 Ericson2314 modified the milestones: 17.09, 18.03 Feb 24, 2018
@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Feb 24, 2018
@Ericson2314 Ericson2314 added this to After big PR in Cross compilation Feb 24, 2018
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: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
No open projects
Cross compilation
After big PR
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @GrahamcOfBorg