From unknown Thu Aug 21 14:54:21 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74416] [PATCH] gnu: petsc: Remove arch version from uname output. Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 18 Nov 2024 12:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74416@debbugs.gnu.org Cc: Lars Bilke , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.173193223127392 (code B ref -1); Mon, 18 Nov 2024 12:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2024 12:17:11 +0000 Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD0gp-00077k-11 for submit@debbugs.gnu.org; Mon, 18 Nov 2024 07:17:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:41114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD0gn-00077b-DA for submit@debbugs.gnu.org; Mon, 18 Nov 2024 07:17:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD0gg-00066n-FA for guix-patches@gnu.org; Mon, 18 Nov 2024 07:17:06 -0500 Received: from mailgate5.ufz.de ([141.65.7.212] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD0gd-00015T-8o for guix-patches@gnu.org; Mon, 18 Nov 2024 07:17:01 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id 64F02160287 for ; Mon, 18 Nov 2024 13:16:51 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=UTF-8 Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SN500K00AV9WV00@imap.intranet.ufz.de> for guix-patches@gnu.org; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.217]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SN500EY3BG31A80@imap.intranet.ufz.de> for guix-patches@gnu.org; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Received: from envinf5.cow-dragon.ts.net (unknown [141.65.34.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp2-UFZ) with ESMTPSA id 3E6BAE004D; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Date: Mon, 18 Nov 2024 13:16:31 +0100 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.44.0 Received-SPF: pass client-ip=141.65.7.212; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 From unknown Thu Aug 21 14:54:21 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74416] [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output. References: In-Reply-To: Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 14:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74416@debbugs.gnu.org Cc: Lars Bilke , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 74416-submit@debbugs.gnu.org id=B74416.173202591231379 (code B ref 74416); Tue, 19 Nov 2024 14:19:01 +0000 Received: (at 74416) by debbugs.gnu.org; 19 Nov 2024 14:18:32 +0000 Received: from localhost ([127.0.0.1]:41589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDP3n-0008A3-Pg for submit@debbugs.gnu.org; Tue, 19 Nov 2024 09:18:32 -0500 Received: from mailgate5.ufz.de ([141.65.7.212]:37112 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDP3l-00089l-DN for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 09:18:30 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id 0E1771602BB for <74416@debbugs.gnu.org>; Tue, 19 Nov 2024 15:18:23 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=UTF-8 Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SN700G00B2XUE00@imap.intranet.ufz.de> for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 15:18:23 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.217]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SN700J7LBQMEO00@imap.intranet.ufz.de> for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 15:18:23 +0100 (CET) Received: from envinf5.cow-dragon.ts.net (unknown [141.65.34.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp2-UFZ) with ESMTPSA id DA7D2E004D; Tue, 19 Nov 2024 15:18:22 +0100 (CET) Date: Tue, 19 Nov 2024 15:18:05 +0100 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.44.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Thu Aug 21 14:54:21 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74416] [PATCH v2 2/2] gnu: petsc: Remove store references on make and gcc. Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 14:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74416@debbugs.gnu.org Cc: Lars Bilke , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 74416-submit@debbugs.gnu.org id=B74416.173202593031413 (code B ref 74416); Tue, 19 Nov 2024 14:19:02 +0000 Received: (at 74416) by debbugs.gnu.org; 19 Nov 2024 14:18:50 +0000 Received: from localhost ([127.0.0.1]:41592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDP46-0008Aa-56 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 09:18:50 -0500 Received: from mailgate5.ufz.de ([141.65.7.212]:55544 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDP43-0008AM-C0 for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 09:18:47 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id EB04D1602BB for <74416@debbugs.gnu.org>; Tue, 19 Nov 2024 15:18:41 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SN700G00B2XUE00@imap.intranet.ufz.de> for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 15:18:41 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.217]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SN700J83BR5EO00@imap.intranet.ufz.de> for 74416@debbugs.gnu.org; Tue, 19 Nov 2024 15:18:41 +0100 (CET) Received: from envinf5.cow-dragon.ts.net (unknown [141.65.34.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp2-UFZ) with ESMTPSA id C5AAEE004D; Tue, 19 Nov 2024 15:18:41 +0100 (CET) Date: Tue, 19 Nov 2024 15:18:06 +0100 From: Lars Bilke In-reply-to: Message-id: <663600da2062af7334e0406a752cd571bf627ce0.1732025886.git.lars.bilke@ufz.de> X-Mailer: git-send-email 2.44.0 References: X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Thu Aug 21 14:54:21 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Lars Bilke Subject: bug#74416: closed (Re: [bug#74416] [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output.) Message-ID: References: <87ttboyc5i.fsf@gnu.org> X-Gnu-PR-Message: they-closed 74416 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74416@debbugs.gnu.org Date: Sat, 30 Nov 2024 15:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1732980542-31028-1" This is a multi-part message in MIME format... ------------=_1732980542-31028-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74416: [PATCH] gnu: petsc: Remove arch version from uname output. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74416@debbugs.gnu.org. --=20 74416: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74416 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1732980542-31028-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74416-done) by debbugs.gnu.org; 30 Nov 2024 15:28:06 +0000 Received: from localhost ([127.0.0.1]:48276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHPO9-00082c-OB for submit@debbugs.gnu.org; Sat, 30 Nov 2024 10:28:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHPO7-00081s-Hb for 74416-done@debbugs.gnu.org; Sat, 30 Nov 2024 10:28:04 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tHPNz-0006wJ-GI; Sat, 30 Nov 2024 10:27:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=mbVfTAhB0hp/6v/Wk9ZuRW3LeDBtdgZI+4jBIm6HiQU=; b=Db6SfU6bPLXDVUSZD7ek NDmLITuNnJjAIWRPkpe7pBTsMlz4+QsTEqPr1EA2r9Oa0adwXGyT59R+rHKVXUOuSCArw34yyibEV r7RdTplGGipPMUZIfQ/AEdK1L85WXfT0/zwevfAPVsNQF+1dFfF68vdBvY0C312SzbcSQrHXvJPw2 B8ZP08zlYkvGnvvphpF0pQZXsMJsBRTPKZSRnLFflHeekd2K8hzdIXyuJUD9k10flXL4+VwzN2b2G l9c/y6VlbCChs4Eyn5OAqFGfz+lpqZIqRykxGsgIeuQDCZhcpI6oCDXV8C9cJaA+auihRvNxUk76M azRoW1tRGr8jsg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Lars Bilke Subject: Re: [bug#74416] [PATCH v2 1/2] gnu: petsc: Remove arch version from uname output. In-Reply-To: (Lars Bilke's message of "Tue, 19 Nov 2024 15:18:05 +0100") References: Date: Sat, 30 Nov 2024 16:27:53 +0100 Message-ID: <87ttboyc5i.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74416-done Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher , 74416-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Lars Bilke skribis: > Enables reproducible building on machines with have a different > arch-suffix in uname output, e.g.: > > Machine=C2=B7characteristics:=C2=B7Linux-x.x.x-arch1-1-x86_64-with-glibc2= .39 > > vs. > > Machine=C2=B7characteristics:=C2=B7Linux-x.x.x-arch2-1-x86_64-with-glibc2= .39 > > Will become > > Machine=C2=B7characteristics:=C2=B7Linux-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'. ------------=_1732980542-31028-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 18 Nov 2024 12:17:11 +0000 Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD0gp-00077k-11 for submit@debbugs.gnu.org; Mon, 18 Nov 2024 07:17:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:41114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tD0gn-00077b-DA for submit@debbugs.gnu.org; Mon, 18 Nov 2024 07:17:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD0gg-00066n-FA for guix-patches@gnu.org; Mon, 18 Nov 2024 07:17:06 -0500 Received: from mailgate5.ufz.de ([141.65.7.212] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tD0gd-00015T-8o for guix-patches@gnu.org; Mon, 18 Nov 2024 07:17:01 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id 64F02160287 for ; Mon, 18 Nov 2024 13:16:51 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=UTF-8 Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SN500K00AV9WV00@imap.intranet.ufz.de> for guix-patches@gnu.org; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.217]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SN500EY3BG31A80@imap.intranet.ufz.de> for guix-patches@gnu.org; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Received: from envinf5.cow-dragon.ts.net (unknown [141.65.34.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp2-UFZ) with ESMTPSA id 3E6BAE004D; Mon, 18 Nov 2024 13:16:51 +0100 (CET) Date: Mon, 18 Nov 2024 13:16:31 +0100 From: Lars Bilke Subject: [PATCH] gnu: petsc: Remove arch version from uname output. To: guix-patches@gnu.org Message-id: X-Mailer: git-send-email 2.44.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received-SPF: pass client-ip=141.65.7.212; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Lars Bilke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 ------------=_1732980542-31028-1--