| Message ID | CAEwRq=peNMiFf5rzKPUDhNFnz27Uko-0t2f=Wmc33qxaPree2w@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#39858] gnu: ccache: Update to 3.7.7. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | fail | View Laminar job |
Hi Vincent, thanks for the patch, some comments below: On 01.03.2020 11:48, Vincent Legoll wrote: > lightly tested: cache hits on trivial .c file compilation And the tests still pass ;) > Trivial ./etc/indent-code.el housekeeping Could you move this to a separate patch, please? > From 9718baa06727eb515030cf7b617a10e9fab8052a Mon Sep 17 00:00:00 2001 > From: Vincent Legoll <vincent.legoll@gmail.com> > Date: Sun, 1 Mar 2020 17:59:10 +0100 > Subject: [PATCH] gnu: ccache: Update to 3.7.7. > > * gnu/packages/ccache.scm (ccache): Update to 3.7.7. > * gnu/packages/ccache.scm (ccache): Update source to github > * gnu/packages/ccache.scm (ccache): Update home-page to ccache.dev > * gnu/packages/ccache.scm (ccache): Add native inputs: asciidoc > autoconf gperf > * gnu/packages/ccache.scm (ccache): Reindent arguments Check the manual and other commit messages for formatting. In particular, the file name only needs to be mentioned once, and the affected sections are mentioned in square brackets before the comment. > --- > gnu/packages/ccache.scm | 33 +++++++++++++++++++++------------ > 1 file changed, 21 insertions(+), 12 deletions(-) > ... > - (method url-fetch) > - (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" > - version ".tar.xz")) > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ccache/ccache.git") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > (sha256 > - (base32 "07wv75xdcxpdkfsz9h5ffrm8pjbvr1dh6wnb02nyzz18cdbjkcd6")))) > + (base32 "1s8mq832chk95wa5qwaalralwv3ln1m931nrgd9a4gi19lg55zln")))) > (build-system gnu-build-system) I think we can actually stick with the tarball available on the github release page: https://github.com/ccache/ccache/releases/download/v3.7.7/ccache-3.7.7.tar.xz which is already bootstrapped. > (native-inputs `(("perl" ,perl) ; for test/run > + ("asciidoc" ,asciidoc) > + ("autoconf" ,autoconf) > + ("gperf" ,gperf) Using the distribution tarball should prevent needing to add these inputs. > (description > "Ccache is a compiler cache. It speeds up recompilation by caching It seems based on the release notes that we also need to remove the mention of Fortran 77 support in the description. Could you send updated patches? Cheers, `~Eric
Hello On Mon, Mar 2, 2020 at 7:24 AM Eric Bavier <bavier@posteo.net> wrote: > Hi Vincent, thanks for the patch, some comments below: > On 01.03.2020 11:48, Vincent Legoll wrote: > > lightly tested: cache hits on trivial .c file compilation > > And the tests still pass ;) Yes, I should have mentionned it > Could you send updated patches? Yes, I will, thanks for the review
From 9718baa06727eb515030cf7b617a10e9fab8052a Mon Sep 17 00:00:00 2001 From: Vincent Legoll <vincent.legoll@gmail.com> Date: Sun, 1 Mar 2020 17:59:10 +0100 Subject: [PATCH] gnu: ccache: Update to 3.7.7. * gnu/packages/ccache.scm (ccache): Update to 3.7.7. * gnu/packages/ccache.scm (ccache): Update source to github * gnu/packages/ccache.scm (ccache): Update home-page to ccache.dev * gnu/packages/ccache.scm (ccache): Add native inputs: asciidoc autoconf gperf * gnu/packages/ccache.scm (ccache): Reindent arguments --- gnu/packages/ccache.scm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index b3f0cbbd95..55d03daf21 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,35 +22,43 @@ (define-module (gnu packages ccache) #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gperf) #:use-module (gnu packages perl) #:use-module (gnu packages compression)) (define-public ccache (package (name "ccache") - (version "3.6") + (version "3.7.7") (source (origin - (method url-fetch) - (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" - version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccache/ccache.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "07wv75xdcxpdkfsz9h5ffrm8pjbvr1dh6wnb02nyzz18cdbjkcd6")))) + (base32 "1s8mq832chk95wa5qwaalralwv3ln1m931nrgd9a4gi19lg55zln")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run + ("asciidoc" ,asciidoc) + ("autoconf" ,autoconf) + ("gperf" ,gperf) ("which" ,(@ (gnu packages base) which)))) (inputs `(("zlib" ,zlib))) (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))))) - (home-page "https://ccache.samba.org/") + (add-before 'check 'setup-tests + (lambda _ + (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t))))) + (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description "Ccache is a compiler cache. It speeds up recompilation by caching -- 2.25.1