From patchwork Tue Nov 19 14:18:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars Bilke X-Patchwork-Id: 70592 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3C59027BBEA; Tue, 19 Nov 2024 14:19:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0A3BC27BBE2 for ; Tue, 19 Nov 2024 14:19:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDP4L-0004rP-3Y; Tue, 19 Nov 2024 09:19:05 -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 1tDP4J-0004rF-46 for guix-patches@gnu.org; Tue, 19 Nov 2024 09:19: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 1tDP4I-0005gp-Rg for guix-patches@gnu.org; Tue, 19 Nov 2024 09:19:02 -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:In-Reply-To:References:Subject; bh=gYQFhJEF3MXGiUd9OaEHBmYYWmFwf69GnkFc6w9hY7c=; b=eaIdXk88TDgwRlf1ThD4VobzqmOymTOXJ6ko8sLj9+fAfXg/m9QnKTR8cMsDyrJ6mgQa7KqC6zS9BFPZy1B1I3PC5C4Zkz2LbizjQ5MhgZgtEyV8Mo77x4D56kS0Gu1GHeD026vlTH1FNIzJ+7WJ5P/XViVaqLWuy1HeQ++6O9mMB+82b3Nog/0EqM2om2z+ZGXAnqdoW4AQE7acmcI1VoeewK/iaKz+Jns8omMrp+32jLdh/Ut9F5P2L0hS5KRxOELNCo0K/2lxbawywnlST9xCgpFuAhOK6W21X9lBzO4/80reJd/i0yrwOcr0kA5cUl7EG2xgBVX5/fMfQx9Daw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDP4H-0008BL-Um; Tue, 19 Nov 2024 09:19:02 -0500 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 23cbbe6860782c5d4a0ba599ea1cda0642e91661 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") From patchwork Tue Nov 19 14:18:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Bilke X-Patchwork-Id: 70591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3583227BBEA; Tue, 19 Nov 2024 14:19:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDDAA27BBE2 for ; Tue, 19 Nov 2024 14:19:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDP4N-0004sB-By; Tue, 19 Nov 2024 09:19:07 -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 1tDP4L-0004re-7h for guix-patches@gnu.org; Tue, 19 Nov 2024 09:19:05 -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 1tDP4K-0005h0-VG for guix-patches@gnu.org; Tue, 19 Nov 2024 09:19:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-reply-to:From:Date:MIME-version:To:Subject; bh=v77FjgMEQNhLg13PBjsWF1ttjxhkgHRXS/bp898zIjs=; b=WEEWAKT1vOxzuTwO/rE7Bzybsw0osmNYdk66DiSCQ9E4Vp2LBGgTHtcjI1nqYGQiwi16jejBJmYaMOLTtKmHFmC9VQOi8iCM6ZGYw3MPxZBX1MrYLwmPNUAiTs6C7esqgl7dh3kbfC+1xZq4M34SUHyc8CB9HOEANw1aVw6Qphe59vHUIt1aQ0QgbLI5fFcb56MfvZuplndVh/uEByZDi8SExOFQgV/6plibueal4Jrox0gs6cIGj9fpBzZVfy+NgUtbhli+4Z55h7ltkGf13UzNynCMDHVyohP23Ku1WfZ1vpwjjFgRUXY7rBPpm5+IYJ9XcvpDDBHTZhDM9QUBAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDP4I-0008BR-F0; Tue, 19 Nov 2024 09:19:02 -0500 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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