diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/ccache.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/ccache.scm')
| -rw-r--r-- | gnu/packages/ccache.scm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 112f613c88..844a0d51a5 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; ;;; This file is part of GNU Guix. @@ -31,32 +31,36 @@ (define-public ccache (package (name "ccache") - (version "4.2") + (version "4.4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "0kx9ggbbm899zwyyxvm4dgzn1b95zi1niz0l734pi5y3i0cb251g")))) + (base32 "0nc1mlmj92lfa25d12nzf5n55az6zfx38n0z1qqkkzjxn6sxzmpb")) + (patches + (search-patches "ccache-fix-basedir-test.patch")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) (inputs `(("zlib" ,zlib) ("zstd" ,zstd "lib"))) (arguments - '(#:phases + '( ;; The Redis backend must be explicitly disabled to build without Redis. + #:configure-flags + '("-DREDIS_STORAGE_BACKEND=OFF") + + #:phases (modify-phases %standard-phases (add-before 'configure 'setup-tests (lambda _ (substitute* '("unittest/test_hashutil.cpp" "test/suites/base.bash") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) - ;; tests require a writable HOME + (("#!/bin/sh") (string-append "#!" (which "sh")))))) (add-before 'check 'set-home + ;; Tests require a writable HOME. (lambda _ - (setenv "HOME" (getenv "TMPDIR")) - #t))))) + (setenv "HOME" (getenv "TMPDIR"))))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description |