unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Lars Bilke <lars.bilke@ufz.de>
To: 74416@debbugs.gnu.org
Cc: Lars Bilke <lars.bilke@ufz.de>, Andreas Enge <andreas@enge.fr>,
	Eric Bavier <bavier@posteo.net>,
	Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#74416] [PATCH] gnu: petsc: Remove arch version from uname output.
Date: Mon, 18 Nov 2024 13:16:31 +0100	[thread overview]
Message-ID: <f4cf3dc4ae8a771480b240557c66b3e05c7d4dbb.1731932191.git.lars.bilke@ufz.de> (raw)

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





             reply	other threads:[~2024-11-18 12:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-18 12:16 Lars Bilke [this message]
2024-11-19 14:18 ` [bug#74416] [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output Lars Bilke
2024-11-19 14:18   ` [bug#74416] [PATCH v2 2/2] gnu: petsc: Remove store references on make and gcc Lars Bilke
2024-11-30 15:27   ` bug#74416: [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output 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=f4cf3dc4ae8a771480b240557c66b3e05c7d4dbb.1731932191.git.lars.bilke@ufz.de \
    --to=lars.bilke@ufz.de \
    --cc=74416@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).