06/07: gnu: petsc: Remove arch version from uname output.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 7ec33a1cc36492d11207833a0ce4c46c9d232845
Author: Lars Bilke <lars.bilke@ufz.de>
AuthorDate: Tue Nov 19 15:18:05 2024 +0100

    gnu: petsc: Remove arch version from uname output.
    
    Enables reproducible building on machines with have a different
    arch-suffix in uname output, e.g.:
    
    Machine·characteristics:·Linux-x.x.x-arch1-1-x86_64-with-glibc2.39
    
    vs.
    
    Machine·characteristics:·Linux-x.x.x-arch2-1-x86_64-with-glibc2.39
    
    Will become
    
    Machine·characteristics:·Linux-x.x.x-archx-x-x86_64-with-glibc2.39
    
    * gnu/packages/maths.scm (petsc)[arguments]: Adjust machine regexp in
    ‘clean-local-references’.
    
    Change-Id: Icc37a298c0c2d16e96f2c8eaf5aa4781cc4e5ac4
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9257a8adb7..b8575397f4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3421,8 +3421,8 @@ September 2004}")
                 (substitute* (find-files "." "^petsc(conf|machineinfo).h$")
                   ;; Prevent build directory from leaking into compiled code
                   (((getcwd)) out)
-                  (("Machine characteristics: Linux-[0-9]+\\.[0-9]+\\.[0-9]+")
-                    "Machine characteristics: Linux-x.x.x"))
+                  (("Machine characteristics: 
Linux-[0-9]+\\.[0-9]+\\.[0-9]+-arch[0-9]+-[0-9]+")
+                    "Machine characteristics: Linux-x.x.x-archx-x"))
                 (substitute* (find-files "." "petscvariables")
                   ;; Do not expose build machine characteristics, set to 
defaults.
                   (("MAKE_NP = [[:digit:]]+") "MAKE_NP = 2")