From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mHNuNZYwO2dMdQEAe85BDQ:P1 (envelope-from ) for ; Mon, 18 Nov 2024 12:18:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id mHNuNZYwO2dMdQEAe85BDQ (envelope-from ) for ; Mon, 18 Nov 2024 13:18:30 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Am/dXOZp"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731932310; a=rsa-sha256; cv=none; b=Prv/lk6VYHBLfK5JOIWzGa+3Ad2W9z32xnF4VjxfjagDvqTUQ5eFiHEXzQZac6yJeep3jg hcB1rkoVEt/nkTtNA++htR85xBzb31XGa2jv2DG1RHbFUsyrRFb4dj6mLSGpb8bYqSvtrR 7filnFMGbhmw79nbAFichiyc3i3EpGm4RY8ejZ5QdP6SNmDaQp8ViILPnXxSSsSaROy8nY XridSIGemwdXQ3ptYpofnNXujYn8vX3xfAE6Ukqg3OktyjauW1Or/qEwOrjqn9h4rCiWg/ +1K1bcOqwQyIB1iYbo5s/qhlo8aeViWUGALsVbgSMIvJnQ4kzuuemrlpaWJfdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="Am/dXOZp"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731932310; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=gYQFhJEF3MXGiUd9OaEHBmYYWmFwf69GnkFc6w9hY7c=; b=hHlcvUahKGY19pB3y/Ruzqr6XaMRo/P7vr2AfhsAY4qSdgJOEsuWJXav1gsOqKqe5uTO1g Np3FZ8GzhwicYehSSQo6Rj4ipPeROF2rWoIff7QcjYWxgd2ER0D7q7MO5BYhL8SCJN4Bpg l+LXvUKUyQTVRpI93Hdm9c9TBCtnxU3DWEi4kfNOOwMlbERQf2XuaHYZ0tduSHgjynkA0p iNOjQs686CBb9TKhamzUnKScTwy9u4vXHeP03N/htEf9lgOnccFs6MceLSsprkkgTC4frA ZJw5v9OnNPiI329Vw89+CUy9fM5xx58pKGS/i2JqpIEJtfAqiQ8ciINYacKZ0g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7EF206433F for ; Mon, 18 Nov 2024 13:18:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD0hu-0007e4-Ro; Mon, 18 Nov 2024 07:18:18 -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 1tD0hf-0007Ed-EZ for guix-patches@gnu.org; Mon, 18 Nov 2024 07:18:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tD0hf-0001PL-0a for guix-patches@gnu.org; Mon, 18 Nov 2024 07:18:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:Date:MIME-version:To:Subject; bh=gYQFhJEF3MXGiUd9OaEHBmYYWmFwf69GnkFc6w9hY7c=; b=Am/dXOZp2x574u4zZICrU84FiTkXurUji9G0NPgb+vuphthPw75gAybnG7LaUBzWkH76bcwE7ryrC3njdYO8ybAIVULHNel+pTNFqXILM71ZHdJHG9F8lZS242SbqkaAU7i0psq9znhtHj5kPYLYTeambjq5Rxtka9qKTKnUEzC13g3nAYCrx8caX5zF6NNT5/CpQJees/1lbJwogSR2aZLyajFPEKSf3uDg8UI3/hHqb/YkwH48Edn2A9ZdCEIDI8y4T3Nk7e077VVjeA+R9e2fzYb1ITik/gA73KdV7+osyalXwp5ARuS204UdkusBFrvoRyv4/6b+wQdZyXOSEQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tD0he-00079S-DW; Mon, 18 Nov 2024 07:18:02 -0500 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.79 X-Spam-Score: -0.79 X-Migadu-Queue-Id: 7EF206433F X-Migadu-Scanner: mx12.migadu.com X-TUID: c2vkVsaSGq33 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