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

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

[Lars Bilke]

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

[bug#74416] [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output.

[Lars Bilke]

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

[bug#74416] [PATCH v2 2/2] gnu: petsc: Remove store references on make and gcc.

[Lars Bilke]

Reduces closure size from 970 MB to around 700 MB for petsc-openmpi
package and also makes `guix pack` packages containing petsc
bit-reproducible (by removing make it removes implicit guile
dependency).

Change-Id: I465c325b152b09befdb746e5bc47fbeaf9a061dc
---
 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 d76937265d..caa7b97b0c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3422,7 +3422,8 @@ (define-public petsc
                   ;; Prevent build directory from leaking into compiled code
                   (((getcwd)) out)
                   (("Machine characteristics: Linux-[0-9]+\\.[0-9]+\\.[0-9]+-arch[0-9]+-[0-9]+")
-                    "Machine characteristics: Linux-x.x.x-archx-x"))
+                    "Machine characteristics: Linux-x.x.x-archx-x")
+                  (("([[:graph:]]+)/bin/make") "\"make"))
                 (substitute* (find-files "." "petscvariables")
                   ;; Do not expose build machine characteristics, set to defaults.
                   (("MAKE_NP = [[:digit:]]+") "MAKE_NP = 2")
@@ -3462,7 +3463,8 @@ (define-public petsc
                 (("([[:graph:]]+)/bin/make") "make")
                 (("([[:graph:]]+)/bin/diff") "diff")
                 (("([[:graph:]]+)/bin/sed") "sed")
-                (("([[:graph:]]+)/bin/gfortran") "gfortran")))))
+                (("([[:graph:]]+)/bin/gfortran") "gfortran")
+                (("([[:graph:]]+)/bin/gcov") "gcov")))))
 
           ;; Some of the tests get linked with '-L$prefix/lib -lpetsc' (even
           ;; though that's unnecessary because they also explicitly link
-- 
2.44.0

bug#74416: [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output.

[Ludovic Courtès]

Lars Bilke <lars.bilke@ufz.de> skribis:

> 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

[...]

> Reduces closure size from 970 MB to around 700 MB for petsc-openmpi
> package and also makes `guix pack` packages containing petsc
> bit-reproducible (by removing make it removes implicit guile
> dependency).
>
> Change-Id: I465c325b152b09befdb746e5bc47fbeaf9a061dc

Adjusted the commit log and applied it, thanks!

Ludo'.