diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-03 16:09:27 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-03 19:23:49 +0200 |
| commit | 9b9c74eaa79cf69ab1b612e5ab02b93d93f2516c (patch) | |
| tree | 5066b09ff164b9e1058020644596c02caaa1cb8b | |
| parent | dfa6e6cad57c20ab87c8aaf289acf35b6e60608f (diff) | |
| download | guix-9b9c74eaa79cf69ab1b612e5ab02b93d93f2516c.tar.gz | |
gnu: ccache: Update to 4.4.2.
* gnu/packages/ccache.scm (ccache): Update to 4.4.2. [source]: Remove patch. [arguments]: Substitute nonexistent compgen. * gnu/packages/patches/ccache-fix-basedir-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/ccache.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/patches/ccache-fix-basedir-test.patch | 26 |
3 files changed, 8 insertions, 33 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d415b892e9..4db3ccd895 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -915,7 +915,6 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ - %D%/packages/patches/ccache-fix-basedir-test.patch \ %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 844a0d51a5..44b0ef606a 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -31,16 +31,14 @@ (define-public ccache (package (name "ccache") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "0nc1mlmj92lfa25d12nzf5n55az6zfx38n0z1qqkkzjxn6sxzmpb")) - (patches - (search-patches "ccache-fix-basedir-test.patch")))) + (base32 "186b5lfbdd48cvbxqv2yh93pgr8lhahl1jzw00k2rmjzmbxwl04j")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) @@ -53,9 +51,13 @@ #:phases (modify-phases %standard-phases - (add-before 'configure 'setup-tests + (add-before 'configure 'fix-shell + ;; Run early whilst we're still in the source directory. (lambda _ - (substitute* '("unittest/test_hashutil.cpp" "test/suites/base.bash") + (substitute* (list "test/run" + "test/suites/base.bash" + "unittest/test_hashutil.cpp") + (("compgen -e") "env | cut -d= -f1") (("#!/bin/sh") (string-append "#!" (which "sh")))))) (add-before 'check 'set-home ;; Tests require a writable HOME. diff --git a/gnu/packages/patches/ccache-fix-basedir-test.patch b/gnu/packages/patches/ccache-fix-basedir-test.patch deleted file mode 100644 index c5f6de7780..0000000000 --- a/gnu/packages/patches/ccache-fix-basedir-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ad18f15287b83cee5a45b63e02b31c6a601a134f Mon Sep 17 00:00:00 2001 -From: Tobias Geerinckx-Rice <me@tobias.gr> -Date: Mon, 27 Sep 2021 19:36:30 +0200 -Subject: [PATCH] gnu: ccache: Fix basedir test. - -Applied upstream. ---- - test/suites/basedir.bash | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/suites/basedir.bash b/test/suites/basedir.bash -index 479c632..34e5cb7 100644 ---- a/test/suites/basedir.bash -+++ b/test/suites/basedir.bash -@@ -269,7 +269,7 @@ EOF - EOF - backdate test.h - -- pwd="$(/bin/pwd -P)" -+ pwd="$(pwd -P)" - $REAL_COMPILER -c $pwd/test.c 2>reference.stderr - - CCACHE_ABSSTDERR=1 CCACHE_BASEDIR="$pwd" $CCACHE_COMPILE -c $pwd/test.c 2>ccache.stderr --- -2.33.0 - |