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

ccache: 3.3.5 -> 3.4.1 #36110

Merged
merged 2 commits into from Mar 1, 2018
Merged

ccache: 3.3.5 -> 3.4.1 #36110

merged 2 commits into from Mar 1, 2018

Conversation

ghost
Copy link

@ghost ghost commented Feb 28, 2018

Motivation for this change

Update ccache version and make it working with GCC 7.3.

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.

@@ -1,18 +1,23 @@
{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }:
{ stdenv, fetchurl, fetchpatch, runCommand, perl, gcc, zlib, makeWrapper }:
Copy link
Member

Choose a reason for hiding this comment

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

Is there a particular reason why gcc is a native build input? gcc should be part of stdenv.

Copy link
Author

@ghost ghost Feb 28, 2018

Choose a reason for hiding this comment

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

Without perl tests will fail with this error:

PASSED: 483 assertions, 96 tests, 10 suites
CC='gcc' /nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/bash ./test/run
./test/run: line 51: perl: command not found
Compiler:         gcc ()
Compiler version: gcc (GCC) 7.3.0
./test/run: line 51: perl: command not found
./test/run: line 51: perl: command not found
CUDA compiler:    not available

Running test suite base../test/suites/base.bash: line 5: -c: command not found

FAILED

Test suite:     base
Test case:      Base case
Failure reason: Objects differ: reference_test1.o != test1.o

ccache -s:
cache directory                     /tmp/nix-build-ccache-3.4.1.drv-2/ccache-3.4.1/testdir.24043/.ccache
primary config                      /tmp/nix-build-ccache-3.4.1.drv-2/ccache-3.4.1/testdir.24043/ccache.conf
secondary config      (readonly)    
stats zero time                     Wed Feb 28 13:47:29 2018
cache hit (direct)                     0
cache hit (preprocessed)               0
cache miss                             1
cache hit rate                      0.00 %
cleanups performed                     0
files in cache                         1
cache size                           4.1 kB
max cache size                       5.0 GB

Test data and log file have been left in testdir.24043
make: *** [Makefile:106: test] Error 1

Copy link
Author

Choose a reason for hiding this comment

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

gcc was removed from nativeBuildInputs.

Timofei Kushnir added 2 commits February 28, 2018 16:55
- `gcc` was removed from `nativeBuildInputs`
- ccache version updated to 3.4.1
- added `man` subpackage
@ghost ghost changed the title ccache: 3.3.5 -> 3.4 ccache: 3.3.5 -> 3.4.1 Feb 28, 2018
@globin
Copy link
Member

globin commented Mar 1, 2018

@GrahamcOfBorg build ccache

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

/nix/store/6b3jzg40vibmrjg85i46vvidyy915428-coreutils-8.29/bin/install -c -d /nix/store/q234rd1y99qrjbklq5pq8667yp5n7y24-ccache-3.4.1-man/share/man/man1
/nix/store/6b3jzg40vibmrjg85i46vvidyy915428-coreutils-8.29/bin/install -c -m 644 ./ccache.1 /nix/store/q234rd1y99qrjbklq5pq8667yp5n7y24-ccache-3.4.1-man/share/man/man1/
post-installation fixup
strip is /nix/store/4sdh09gmvl15cy0zb6i7mbvxh5syz206-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/6f5yv3jg1gwf29fa8a1pa76ngfrdghj3-ccache-3.4.1/bin
patching script interpreter paths in /nix/store/6f5yv3jg1gwf29fa8a1pa76ngfrdghj3-ccache-3.4.1
gzipping man pages under /nix/store/q234rd1y99qrjbklq5pq8667yp5n7y24-ccache-3.4.1-man/share/man/
strip is /nix/store/4sdh09gmvl15cy0zb6i7mbvxh5syz206-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/q234rd1y99qrjbklq5pq8667yp5n7y24-ccache-3.4.1-man
/nix/store/6f5yv3jg1gwf29fa8a1pa76ngfrdghj3-ccache-3.4.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/55vjxjkqfw5bwbv9bc93hcj8cg9vh03s-ccache-3.4.1/bin
patching script interpreter paths in /nix/store/55vjxjkqfw5bwbv9bc93hcj8cg9vh03s-ccache-3.4.1
checking for references to /build in /nix/store/55vjxjkqfw5bwbv9bc93hcj8cg9vh03s-ccache-3.4.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/a9h6b69m80295lra5jwj2iz0z8a0amfx-ccache-3.4.1-man
gzipping man pages under /nix/store/a9h6b69m80295lra5jwj2iz0z8a0amfx-ccache-3.4.1-man/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/a9h6b69m80295lra5jwj2iz0z8a0amfx-ccache-3.4.1-man
checking for references to /build in /nix/store/a9h6b69m80295lra5jwj2iz0z8a0amfx-ccache-3.4.1-man...
/nix/store/55vjxjkqfw5bwbv9bc93hcj8cg9vh03s-ccache-3.4.1

@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/bk3hvkxywzc537m2w3di68aw7pwz80df-ccache-3.4.1/bin 
patching script interpreter paths in /nix/store/bk3hvkxywzc537m2w3di68aw7pwz80df-ccache-3.4.1
checking for references to /tmp/nix-build-ccache-3.4.1.drv-0 in /nix/store/bk3hvkxywzc537m2w3di68aw7pwz80df-ccache-3.4.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/4s2spa0783wj0p51hacmkclli4hhi9vg-ccache-3.4.1-man
gzipping man pages under /nix/store/4s2spa0783wj0p51hacmkclli4hhi9vg-ccache-3.4.1-man/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
patching script interpreter paths in /nix/store/4s2spa0783wj0p51hacmkclli4hhi9vg-ccache-3.4.1-man
checking for references to /tmp/nix-build-ccache-3.4.1.drv-0 in /nix/store/4s2spa0783wj0p51hacmkclli4hhi9vg-ccache-3.4.1-man...
/nix/store/bk3hvkxywzc537m2w3di68aw7pwz80df-ccache-3.4.1

@globin globin merged commit 15893aa into NixOS:master Mar 1, 2018
@ghost ghost deleted the fix-ccache branch March 2, 2018 08:20
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

3 participants