From patchwork Tue Mar 23 12:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 28026 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CCDEF27BC5C; Tue, 23 Mar 2021 12:22:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B4F8827BC59 for ; Tue, 23 Mar 2021 12:22:14 +0000 (GMT) Received: from localhost ([::1]:41978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOg33-00061d-Uw for patchwork@mira.cbaines.net; Tue, 23 Mar 2021 08:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOg2t-00061M-KC for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOg2s-0002sC-B4 for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOg2s-0003E6-6t for guix-patches@gnu.org; Tue, 23 Mar 2021 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47340] [PATCH] gnu: ccache: Update to 4.2. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Mar 2021 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47340 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47340@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161650210012372 (code B ref -1); Tue, 23 Mar 2021 12:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Mar 2021 12:21:40 +0000 Received: from localhost ([127.0.0.1]:59744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOg2S-0003DQ-VR for submit@debbugs.gnu.org; Tue, 23 Mar 2021 08:21:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:43544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOg2Q-0003DI-L7 for submit@debbugs.gnu.org; Tue, 23 Mar 2021 08:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOg2Q-0005m2-8E for guix-patches@gnu.org; Tue, 23 Mar 2021 08:21:34 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]:44597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOg2N-0002Um-TR for guix-patches@gnu.org; Tue, 23 Mar 2021 08:21:34 -0400 Received: by mail-il1-x12e.google.com with SMTP id t6so17947109ilp.11 for ; Tue, 23 Mar 2021 05:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=PNioY7WyOpSjCOVyGaBD4m4lsn5gXClqs3fBEg+p1fw=; b=kywQx6j8/RzeWgzUvwVO0kUhqOUAGJh9flhoiYH27phsWtZwXoTU/7E/Eotp+4dS95 AU70+ifKsToKqII+/I9P5r9h4iM1B+AfSqxsv1eWgokWmbYal5HzcMKl5Yw3ANmZcJgt jYw8kW/N6HQo/Cv5AUHAw7qYxFPlwmD4unTO1CKiyVrw1WVmgOhW+32StSdeCMFndlDd S9ElVIZto12d967IqzT3iz5Q57jwDkWXpgm3bKQxX9EVtFhcM0lwkhRvfo8mIbGJZlZ/ M+6voD/dy2WCcZvwErewSFmWu5F8105EmbjXyCqU1BxmtB+xqr7QhVlP6vuU7G3bmBND 2dJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=PNioY7WyOpSjCOVyGaBD4m4lsn5gXClqs3fBEg+p1fw=; b=aa3jJHVvdUrYgUa9ZkjLIEKod2SCJPc63UUg4Tm92xgU8vJ1U7NZBplMxdweq8DFBG E9E960fsWnnTfdKWvsQJ2zXwx3rBS9miP8/r1gvQoRpIQdx+zohGAuq/b0PozrODiIc0 umlKWuDHIECoSe1PvCVY7jgylsblb+ExJ6f97fFxRws04OiiyxWq9XpCG9gKdJW4i23u MDVpfcL0hDA8jU4/j6M2hl0JVq963kdC8rRGNR9tlCbiUEV1rGJFsaGTQAFDgpYLUwfT zY5dYqRXKlwy0zguKP6WSEGpxNHeHoWDOsLAOKCfe2Pvx1PqpUy1ABV8D5L2OhzBfSgw w38w== X-Gm-Message-State: AOAM532j1pyw4q+tx1M7OGnEvVMqXUT9j8OztrPzXh+ebbtJpEFdy0Vc fXL5mDeJND1HpiuJpQ1ZVR1zfJsmHoLC+TTkis4RD00iS91Y9Y995n8= X-Google-Smtp-Source: ABdhPJyY250xIJ3+qwMwKv+B60cxoinJelg+2VW2q6vhE58C8X4u8nrDadShvNovTFSldJ2F9EhVeusKnuHTAxy8y/g= X-Received: by 2002:a92:540d:: with SMTP id i13mr4545781ilb.8.1616502089730; Tue, 23 Mar 2021 05:21:29 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Tue, 23 Mar 2021 08:21:17 -0400 Message-ID: Received-SPF: none client-ip=2607:f8b0:4864:20::12e; envelope-from=code@greghogan.com; helo=mail-il1-x12e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 5a1aeefefb1ed289a4358dff0b8719e0b4c44d9c Mon Sep 17 00:00:00 2001 From: Greg Hogan 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(-) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- 2.31.0 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 ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Greg Hogan ;;; ;;; 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)))))