unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Felix Gruber <felgru@posteo.net>
To: 46929@debbugs.gnu.org
Cc: Felix Gruber <felgru@posteo.net>
Subject: [bug#46929] [PATCH v3 08/12] gnu: dune-alugrid: Update to 2.7.1.
Date: Sat, 18 Dec 2021 13:36:56 +0000	[thread overview]
Message-ID: <20211218133700.10135-9-felgru@posteo.net> (raw)
In-Reply-To: <20211218133700.10135-1-felgru@posteo.net>

* 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
-- 
2.30.2





  parent reply	other threads:[~2021-12-18 13:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-04 19:53 [bug#46929] [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Felix Gruber
2021-05-20 22:06 ` [bug#46929] [PATCH v2] " Felix Gruber
2021-12-18 13:36   ` [bug#46929] [PATCH v3 00/12] " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 01/12] gnu: Modernize add-openmpi-to-dune-package Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 02/12] gnu: dune-common: Update to 2.7.1 Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 03/12] gnu: dune-geometry: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 04/12] gnu: dune-uggrid: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 05/12] gnu: dune-grid: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 06/12] gnu: dune-istl: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 07/12] gnu: dune-localfunctions: " Felix Gruber
2021-12-18 13:36     ` Felix Gruber [this message]
2021-12-18 13:36     ` [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 10/12] gnu: dune-typetree: " Felix Gruber
2021-12-18 13:36     ` [bug#46929] [PATCH v3 11/12] gnu: dune-functions: " Felix Gruber
2021-12-18 13:37     ` [bug#46929] [PATCH v3 12/12] gnu: dune-pdelab: " Felix Gruber
2022-01-20 13:57     ` bug#46929: [PATCH] gnu: maths: dune-*: Update to version 2.7.1 Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211218133700.10135-9-felgru@posteo.net \
    --to=felgru@posteo.net \
    --cc=46929@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).