From patchwork Sat Dec 18 13:36:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35382 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 9EB8727BBEA; Sat, 18 Dec 2021 13:43:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E4C1527BBE9 for ; Sat, 18 Dec 2021 13:43:51 +0000 (GMT) Received: from localhost ([::1]:55670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mya07-0000Zz-3H for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 08:43:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myZvU-0002qU-MR for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myZvU-0003cp-EN for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myZvU-0007sI-DO for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: Update to 2.7.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 13:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46929@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 46929-submit@debbugs.gnu.org id=B46929.163983469530144 (code B ref 46929); Sat, 18 Dec 2021 13:39:04 +0000 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:15 +0000 Received: from localhost ([127.0.0.1]:41496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZug-0007q1-KE for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuY-0007no-5r for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:06 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 751DA240027 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834680; bh=WppNoWSVlrS4/ejdQoErYuMWPKZjrLzQ4ag9dLII0TY=; h=From:To:Cc:Subject:Date:From; b=bMcW6iQLKnSNSXrJrB3HcnAwn9x4jFFAbh0fYy1SExfA5+y2nveZg3xH8OG96dw5N yQnHuyDWl+mnv/KXvBO++Q8PFG7TBCSW9OCxdCIBFwqj99Q9iGKDft4wd7UgjBzDMf sDhu/hJrCLuspoQjxwxwZCkHPP1GITKf0/f5u2dkfXKj9VCnDP3b91/dExcHTLHqTB D9dHOphrJIMX8XpovQz4517wH1BKxg9ta+ebiacKBK7+Tk4qN+5hxBQ2FovhBBpl+N on4jgtm+1vvegskBL9GqU2EUL1fsLHUzXdRQ2O6HrCJzMFfI2m4qzTYSqTPvrbgt3r /HGTr7u4FQ0ww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkH6rn1z6tpZ; Sat, 18 Dec 2021 14:37:59 +0100 (CET) From: Felix Gruber Date: Sat, 18 Dec 2021 13:36:56 +0000 Message-Id: <20211218133700.10135-9-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-1-felgru@posteo.net> MIME-Version: 1.0 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 * gnu/packages/maths.scm (dune-alugrid): Update to 2.7.1. [version]: Use `git-version` to compute the version string. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 97 ++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 60cab4ab2c..9874972e20 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6530,53 +6530,60 @@ assemble global function spaces on finite-element grids.") (license license:gpl2))) (define-public dune-alugrid - (package - (name "dune-alugrid") - (version "2.7.0-git-81d35682") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit "81d356827c84454b971937db02c02b90bbcd7fe5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z54lwfp53prcrs94k8gwh047l9z642jll3l56xlyfr69z0b2zz1")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-include - (lambda _ - (substitute* "dune/alugrid/test/test-alugrid.cc" - (("doc/grids/gridfactory/testgrids") - "doc/dune-grid/grids/gridfactory/testgrids")) - #t)) - (add-after 'build 'build-tests - (lambda* (#:key inputs make-flags #:allow-other-keys) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - (list dune-common - dune-geometry - dune-grid - ;; Optional - metis - openblas - python - superlu - gmp - zlib)) - (native-inputs - (list gfortran pkg-config)) - (home-page "https://dune-project.org/") - (synopsis "Distributed and Unified Numerics Environment") - (description "ALUGrid is an adaptive, loadbalancing, unstructured + ;; This was the last commit on the releases/2.7 branch as of 2021-12-17, + ;; unfortunately there was no tag for any 2.7 release. + (let ((commit "51bde29a2dfa7cfac4fb73d40ffd42b9c1eb1d3d")) + (package + (name "dune-alugrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z16wg6llzxs7vjg2yilg31vwnkz8k050j6bspg3blbym0razy15")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-include + (lambda _ + (substitute* "dune/alugrid/test/test-alugrid.cc" + (("doc/grids/gridfactory/testgrids") + "doc/dune-grid/grids/gridfactory/testgrids")) + #t)) + (add-after 'build 'build-tests + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "dune-grid") "/share")) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) + (inputs + (list dune-common + dune-geometry + dune-grid + ;; Optional + metis + openblas + python + superlu + gmp + zlib)) + (native-inputs + (list gfortran pkg-config)) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "ALUGrid is an adaptive, loadbalancing, unstructured implementation of the DUNE grid interface supporting either simplices or cubes.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-subgrid (package