unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 72877@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>,
	"Andreas Enge" <andreas@enge.fr>,
	"Eric Bavier" <bavier@posteo.net>,
	"Sharlatan Hellseher" <sharlatanus@gmail.com>
Subject: [bug#72877] [PATCH 5/8] gnu: petsc: Make ‘petscvariables’ reproducible.
Date: Thu, 29 Aug 2024 17:39:38 +0200	[thread overview]
Message-ID: <4785fd2599682973b16ea0bdab44c909568b0292.1724945557.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1724945557.git.ludo@gnu.org>

This is a followup to 31fe177a97bacec643180cc5bcf8805a6cb07481.

* gnu/packages/maths.scm (petsc)[arguments]: In
‘clean-local-references’, fix typo in ‘MAKE_NP’ and ‘NPMAX’ regexps.
Substitute ‘MAKE_TEST_NP’ and ‘MAKE_LOAD’ as well.

Change-Id: I41b4279a3cdc4b077fab21f0f99273d0d50ed8e1
---
 gnu/packages/maths.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 7249eb68da..ff1be6d35a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3578,8 +3578,10 @@ (define-public petsc
                     "Machine characteristics: Linux-x.x.x"))
                 (substitute* (find-files "." "petscvariables")
                   ;; Do not expose build machine characteristics, set to defaults.
-                  (("MAKE_NP = [:digit:]+") "MAKE_NP = 2")
-                  (("NPMAX = [:digit:]+") "NPMAX = 2")))))
+                  (("MAKE_NP = [[:digit:]]+") "MAKE_NP = 2")
+                  (("MAKE_TEST_NP = [[:digit:]]+") "MAKE_TEST_NP = 2")
+                  (("MAKE_LOAD = .*") "MAKE_LOAD = 256.0\n")
+                  (("NPMAX = [[:digit:]]+") "NPMAX = 2")))))
           (add-after 'install 'clean-install
             ;; Try to keep installed files from leaking build directory names.
             (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.45.2





  parent reply	other threads:[~2024-08-29 15:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-29 15:38 [bug#72877] [PATCH 0/8] Upgrade PETSc, SLEPc, SUNDIALS, and DealII Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 1/8] gnu: petsc: Update to 3.21.4 Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 2/8] gnu: python-petsc4py: " Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 3/8] gnu: slepc: Update to 3.21.1 Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 4/8] gnu: python-slepc4py: " Ludovic Courtès
2024-08-29 15:39 ` Ludovic Courtès [this message]
2024-08-29 15:39 ` [bug#72877] [PATCH 6/8] gnu: sundials: Upgrade to 7.1.1 Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 7/8] gnu: sundials, sundials-openmpi: Use gexps Ludovic Courtès
2024-08-29 15:39 ` [bug#72877] [PATCH 8/8] gnu: dealii: Update to 9.6.0 Ludovic Courtès
2024-09-05  8:17 ` bug#72877: [PATCH 0/8] Upgrade PETSc, SLEPc, SUNDIALS, and DealII Ludovic Courtès
2024-09-05 13:07   ` [bug#72877] " Eric Bavier
2024-09-05 14:40     ` 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=4785fd2599682973b16ea0bdab44c909568b0292.1724945557.git.ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=72877@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=sharlatanus@gmail.com \
    /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).