GNU bug report logs - #74416
[PATCH] gnu: petsc: Remove arch version from uname output.

Previous Next

Full log

View this message in rfc822 format

From: Lars Bilke <lars.bilke <at> ufz.de>
To: 74416 <at> debbugs.gnu.org
Cc: Lars Bilke <lars.bilke <at> ufz.de>, Andreas Enge <andreas <at> enge.fr>, Eric Bavier <bavier <at> posteo.net>,  Sharlatan Hellseher <sharlatanus <at> gmail.com>
Subject: [bug#74416] [PATCH] gnu: petsc: Remove arch version from uname output.
Date: Mon, 18 Nov 2024 13:16:31 +0100

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

Change-Id: Icc37a298c0c2d16e96f2c8eaf5aa4781cc4e5ac4
---
 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 62b4f63ac9..d76937265d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3421,8 +3421,8 @@ (define-public petsc
                 (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")

base-commit: 23cbbe6860782c5d4a0ba599ea1cda0642e91661
-- 
2.44.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.