GNU bug report logs - #47340
[PATCH] gnu: ccache: Update to 4.2.

Previous Next

Package: guix-patches;

Reported by: Greg Hogan <code <at> greghogan.com>

Date: Tue, 23 Mar 2021 12:22:02 UTC

Severity: normal

Tags: patch

Done: Efraim Flashner <efraim <at> flashner.co.il>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Greg Hogan <code <at> greghogan.com>
Subject: bug#47340: closed (Re: [bug#47340] [PATCH] gnu: ccache: Update to
 4.2.)
Date: Wed, 24 Mar 2021 13:08:01 +0000
[Message part 1 (text/plain, inline)]
Your bug report

#47340: [PATCH] gnu: ccache: Update to 4.2.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 47340 <at> debbugs.gnu.org.

-- 
47340: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=47340
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Efraim Flashner <efraim <at> flashner.co.il>
To: Greg Hogan <code <at> greghogan.com>
Cc: 47340-done <at> debbugs.gnu.org
Subject: Re: [bug#47340] [PATCH] gnu: ccache: Update to 4.2.
Date: Wed, 24 Mar 2021 15:06:50 +0200
[Message part 3 (text/plain, inline)]
Looks good! Patch pushed.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
[Message part 5 (message/rfc822, inline)]
From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: ccache: Update to 4.2.
Date: Tue, 23 Mar 2021 08:21:17 -0400
[Message part 6 (text/plain, inline)]
From 5a1aeefefb1ed289a4358dff0b8719e0b4c44d9c Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Mon, 22 Mar 2021 19:52:23 +0000
Subject: [PATCH] gnu: ccache: Update to 4.2.

* gnu/packages/ccache.scm (ccache): Update to 4.2.
[build-system]: Switch to cmake-build-system.
[inputs]: Add zstd:lib.
[arguments]: Move substitution before change of directory and add phase
to set HOME variable.
---
 gnu/packages/ccache.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm
index c5b9790f27..112f613c88 100644
--- a/gnu/packages/ccache.scm
+++ b/gnu/packages/ccache.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +23,7 @@
   #:use-module (guix packages)
   #:use-module ((guix licenses) #:select (gpl3+))
   #:use-module (guix download)
-  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages compression))
@@ -30,25 +31,32 @@
 (define-public ccache
   (package
     (name "ccache")
-    (version "3.7.12")
+    (version "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 "005liq8csgxdn7m9hj2ah07hishww855p8sc96y1hrnwc21lwbx0"))))
-    (build-system gnu-build-system)
+        (base32 "0kx9ggbbm899zwyyxvm4dgzn1b95zi1niz0l734pi5y3i0cb251g"))))
+    (build-system cmake-build-system)
     (native-inputs `(("perl" ,perl)     ; for test/run
                      ("which" ,(@ (gnu packages base) which))))
-    (inputs `(("zlib" ,zlib)))
+    (inputs `(("zlib" ,zlib)
+              ("zstd" ,zstd "lib")))
     (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'setup-tests
-                    (lambda _
-                      (substitute* '("unittest/test_hashutil.c"
"test/suites/base.bash")
-                        (("#!/bin/sh") (string-append "#!" (which "sh"))))
-                      #t)))))
+     '(#: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
+         (add-before 'check 'set-home
+           (lambda _
+             (setenv "HOME" (getenv "TMPDIR"))
+     #t)))))
     (home-page "https://ccache.dev/")
     (synopsis "Compiler cache")
     (description
--
2.31.0
[Message part 7 (text/html, inline)]
[0001-gnu-ccache-Update-to-4.2.patch (application/octet-stream, attachment)]

This bug report was last modified 4 years and 137 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.