From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 EBPZDbCW0Gah8wAAqHPOHw:P1 (envelope-from ) for ; Thu, 29 Aug 2024 15:41:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id EBPZDbCW0Gah8wAAqHPOHw (envelope-from ) for ; Thu, 29 Aug 2024 17:41:36 +0200 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=kw1kSedk; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=QbedxI51; dmarc=pass (policy=none) header.from=gnu.org; 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=1724946096; 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:dkim-signature; bh=6m8Crqi7wonWIBZV1H4vV3P8vg4OwraClOOAo3pw2DM=; b=bKEsZcccqj0mXp1chchcfM5Ap4hjCVIHoJm/iH6/8SNlibrTGSTT9YX4+FDrtTilImHthF jODIuOvmHqOS5wmFHxgS49yBiYh5gUoo4Z8V7OkER8WfMR46a/p5s5DGPedSjlmOOCChxi VaG8jqpW2FyQBaMG+nMxawcU4Sq7ycV5UyMb2QASNYxjwKLzj5gxr/bd0gG7PfyxkQ1BKQ q3GlMK+faB4iP2LnCVSTEba8HzqtmkM94jwkKzsUSCXJV61IiaDpS2D3+OQ/04RtFklp/S 9plXTOE4YhJK0s1p0kXlJs4nAllU1v64HleKVonHD3BP0JNdLmHrxacuxpMdMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724946096; a=rsa-sha256; cv=none; b=Y2kfafKVEdX0/kYDLUTaon0nfj2X+JmGwT56e11jm3+NINjeI9FWG09Mj8UdKbFxdnACG1 CkmJ0/1znz97wudADqhwqgxxqexU9u5NSHlA/Zs4XXvYAEdkGK6kUBAZ+781RcuMdWEPoJ jQjZKlqDyrpwmm/TofrnsDGBrR23W56GNP4ClgC6J555pUozFPgaDIaGUMkYrhxGX8vxBV EOdVe9HSZz7saTXBJuowYleWeGm+G9sS7V4Zc3PyNG9OKZn7tERDqlE2YSVpnOcZfYl1wL 5ho0peTdETxnbApX+G5+Qy1wTMKl2ayP3F6vPIrHt5LncmhNSlam4vaf+CzUPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=kw1kSedk; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=QbedxI51; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 16FF21F4E6 for ; Thu, 29 Aug 2024 17:41:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhGx-0005k0-0l; Thu, 29 Aug 2024 11:41:19 -0400 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 1sjhGn-0005fU-Fj for guix-patches@gnu.org; Thu, 29 Aug 2024 11:41:09 -0400 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 1sjhGm-0001I7-Ka for guix-patches@gnu.org; Thu, 29 Aug 2024 11:41:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=6m8Crqi7wonWIBZV1H4vV3P8vg4OwraClOOAo3pw2DM=; b=kw1kSedkzMZHqRe2aPK4dp3oPlPfovjke1GWqzmGT0zJf/Uq7dqa+Qp5a742eW6DkmWVTCa71V4eTGVCaMhX0CLgcq9feGFagtLaJ9Fm9/67vy3cee6rYBvWEZ4ZiVYw0rgm9RSUs3TF+3IPphxI/ULoU+tbRkTzp3ILy9UKXX+7D+xtEm7tNK97Ccomx/eqKXECl6Uxz8UcJj26g2VKaPPXuJcsX9NWTMSjIxedYCqkcBUtdKSioQHAeVWjwpOuXriLC0ydfnmDLsLuj8G2t2CKTI5TVuyqAw8IcB9CYUg7yS76AicpGNuLlidByz6ky1w4iaB3Fl6a86FogEP/mw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sjhHe-0003fx-5U; Thu, 29 Aug 2024 11:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72877] [PATCH 5/8] gnu: petsc: Make =?UTF-8?Q?=E2=80=98petscvariables=E2=80=99?= reproducible. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72877 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72877@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 72877-submit@debbugs.gnu.org id=B72877.172494606513987 (code B ref 72877); Thu, 29 Aug 2024 15:42:02 +0000 Received: (at 72877) by debbugs.gnu.org; 29 Aug 2024 15:41:05 +0000 Received: from localhost ([127.0.0.1]:51974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhGj-0003dS-Gi for submit@debbugs.gnu.org; Thu, 29 Aug 2024 11:41:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhGa-0003bH-48 for 72877@debbugs.gnu.org; Thu, 29 Aug 2024 11:40:56 -0400 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 1sjhFb-0000zu-Au; Thu, 29 Aug 2024 11:39:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=6m8Crqi7wonWIBZV1H4vV3P8vg4OwraClOOAo3pw2DM=; b=QbedxI51ht6kCRXJNcsz 0jrqlTOmxwiDymdZ313Co8Fl73S1MttjlxgRT2Dg30+iS+dqQkJ2uwxY6RxCxlED/Ccou1Lm+xYWS 5HhoUYcvLIDN0u/fHsZX+l0Dxsx9PEMWiPj1vSvi1Qy0cXOlJ1t2iBdV1uuVXQYpCDWnzqzDFLqTs eb+h4VbpzQbyJQ7EZsIaNPH2Q6IwRF5EWHS/gi96OcjxqZdaOEq1ESWSU5EPf5H5f+nEjTWy82K1p Lmb2zc09WAdedp4df7iUb+fRhGDPd0HzTiX++RDLsWRgLJ/DRN108YeksOBTqhCmZS4R3F2wopAhA BnlUsqLCZxrt2g==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 29 Aug 2024 17:39:38 +0200 Message-ID: <4785fd2599682973b16ea0bdab44c909568b0292.1724945557.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Queue-Id: 16FF21F4E6 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.08 X-Spam-Score: -8.08 X-TUID: n5IWhfn7wYAf This is a followup to 31fe177a97bacec643180cc5bcf8805a6cb07481. * gnu/packages/maths.scm (petsc)[arguments]: In ‘clean-local-references’, fix typo in ‘MAKE_NP’ and ‘NPMAX’ regexps. Substitute ‘MAKE_TEST_NP’ and ‘MAKE_LOAD’ as well. Change-Id: I41b4279a3cdc4b077fab21f0f99273d0d50ed8e1 --- 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 7249eb68da..ff1be6d35a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3578,8 +3578,10 @@ (define-public petsc "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 = .*") "MAKE_LOAD = 256.0\n") + (("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) -- 2.45.2