From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CClRBSZj4GXQLgEA62LTzQ:P1 (envelope-from ) for ; Thu, 29 Feb 2024 11:57:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id CClRBSZj4GXQLgEA62LTzQ (envelope-from ) for ; Thu, 29 Feb 2024 11:57:42 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709204262; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=MgWH7TFUlCeJFvltRrBGOef2+TrRIsDmIa+HnF715SY=; b=XuhagvyCvlzC3c8zT2lFFE4gxh6ls9oi3TlE4tY+dpGke6uHFTkh+T7GlTJkQqvtMJzkWF m1JKC+Zho5ypWsEZjRc9WrwaZwCVZY0H5MHu88/c1gDptSgko2tlSSR3bjCLIcHycO6MZU e2Wd0fvMlxY88Wlep70Ud+TSGsinQgZB8582hTWBt1B2GgX/yEmH4GXuXifwnZdoQto1hp PqynpTbB/AjGcS37Y6IBwgCgp1K4wAOHCg0baqiejhkZBoLLzAKirmjTVdq0giI9tgSKZM PI2vo8kO3S/qwzy6NsgWTcJ4sH6yeqb1HA7jnyIb2yBRGs/j5+0tduFO+ZlNbg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709204262; a=rsa-sha256; cv=none; b=qZR41byDp+aOGjSim5fWogGGAURlsdcYHnDj4M9llk3laOpK5/JaP7FY5YOX9Pyon17vBq FWYbhacD/iokSyKA/67a81oYH+QP8YKU+Wqr1OelWqLnhr59A28cioNOcw0KD72NJ5SH2e 1C+aIGcurv4sn9T7Y6NRaD2tusKc+bkHwESzeE0a5XScQSMC0exHP7MQHbqvuR/lQlFkJ3 pkgZzpAtrMqkqhDyLJONNIxEhYkQJ+bFVNVZJwWNaoEC2bhUbWNHvR/hD/4+8KqL5yocfD PKiIHQbZg2rDUyTBAuKUbctqQLKcc6c2JwsAJAx0j7x+Qjz9iTJjSBOgR0H03Q== 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 C6BA1658FE for ; Thu, 29 Feb 2024 11:57:41 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfdDL-0004Rg-5I; Thu, 29 Feb 2024 05:00:31 -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 1rfd2o-0007bo-9t for bug-guix@gnu.org; Thu, 29 Feb 2024 04:49:38 -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 1rfd2o-00026b-1Z for bug-guix@gnu.org; Thu, 29 Feb 2024 04:49:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rfd3C-00019k-9j; Thu, 29 Feb 2024 04:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#57005: [PATCH v1] gnu: petsc: scrub build machine specifics References: <87fsiag2vm.fsf@inria.fr> In-Reply-To: <87fsiag2vm.fsf@inria.fr> Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, bug-guix@gnu.org Resent-Date: Thu, 29 Feb 2024 09:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57005 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 57005@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 57005-submit@debbugs.gnu.org id=B57005.17092001794406 (code B ref 57005); Thu, 29 Feb 2024 09:50:02 +0000 Received: (at 57005) by debbugs.gnu.org; 29 Feb 2024 09:49:39 +0000 Received: from localhost ([127.0.0.1]:33569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfd2m-00018s-A3 for submit@debbugs.gnu.org; Thu, 29 Feb 2024 04:49:38 -0500 Received: from mailgate4.ufz.de ([141.65.7.211]:45080 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rfd2Z-000179-A6 for 57005@debbugs.gnu.org; Thu, 29 Feb 2024 04:49:35 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate4-UFZ) with ESMTP id C65121602BC for <57005@debbugs.gnu.org>; Thu, 29 Feb 2024 10:48:49 +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 <0S9M007002Y55I00@imap.intranet.ufz.de> for 57005@debbugs.gnu.org; Thu, 29 Feb 2024 10:48:49 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.216]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0S9M00H0T3904TF0@imap.intranet.ufz.de> for 57005@debbugs.gnu.org; Thu, 29 Feb 2024 10:48:37 +0100 (CET) Received: from envinf4.minotaur-alpha.ts.net (unknown [141.65.34.85]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp1-UFZ) with ESMTPSA id E50C380211; Thu, 29 Feb 2024 10:48:36 +0100 (CET) Date: Thu, 29 Feb 2024 10:46:50 +0100 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.43.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 29 Feb 2024 05:00:24 -0500 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.77 X-Spam-Score: -4.77 X-Migadu-Queue-Id: C6BA1658FE X-Migadu-Scanner: mx13.migadu.com X-TUID: WILduCD9pAy2 'Libraries compiled on' does not have to be removed since PETSc 3.9: https: //gitlab.com/petsc/petsc/-/commit/a970bd748978a4e12790be7c36b10e832ec0149f Change-Id: I41d82339e43187d7dc7e3fc189a338784c363c68 --- gnu/packages/maths.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1f61ee0583..f09cbee48b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3455,18 +3455,21 @@ (define-public petsc (substitute* "config/example_template.py" (("#!/usr/bin/env bash") (string-append "#!" (which "bash"))))))) - (add-after 'configure 'clean-local-references + (add-after 'install 'clean-local-references (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (find-files "." "^petsc(conf|machineinfo).h$") ;; Prevent build directory from leaking into compiled code (((getcwd)) out) - ;; Scrub timestamp for reproducibility - ((".*Libraries compiled on.*") "")) + ;; Scrub build machine characteristic + (("Machine characteristics: Linux-[0-9]+\\.[0-9]+\\.[0-9]+") + "Machine characteristics: Linux-x.x.x")) (substitute* (find-files "." "petscvariables") ;; Do not expose build machine characteristics, set to defaults. - (("MAKE_NP = [:digit:]+") "MAKE_NP = 2") - (("NPMAX = [:digit:]+") "NPMAX = 2"))))) + (("MAKE_NP = [[:digit:]]+") "MAKE_NP = 2") + (("MAKE_TEST_NP = [[:digit:]]+") "MAKE_TEST_NP = 2") + (("MAKE_LOAD = [[:digit:]]+\\.[[:digit:]]+") "MAKE_LOAD = 2.0") + (("NPMAX = [[:digit:]]+") "NPMAX = 2"))))) (add-after 'install 'clean-install ;; Try to keep installed files from leaking build directory names. (lambda* (#:key inputs outputs #:allow-other-keys) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be -- 2.43.0