From: Lars Bilke <lars.bilke@ufz.de>
To: 74416@debbugs.gnu.org
Cc: Lars Bilke <lars.bilke@ufz.de>, Andreas Enge <andreas@enge.fr>,
Eric Bavier <bavier@posteo.net>,
Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#74416] [PATCH v2 2/2] gnu: petsc: Remove store references on make and gcc.
Date: Tue, 19 Nov 2024 15:18:06 +0100 [thread overview]
Message-ID: <663600da2062af7334e0406a752cd571bf627ce0.1732025886.git.lars.bilke@ufz.de> (raw)
In-Reply-To: <f4cf3dc4ae8a771480b240557c66b3e05c7d4dbb.1732025886.git.lars.bilke@ufz.de>
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
prev parent reply other threads:[~2024-11-19 14:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-18 12:16 [bug#74416] [PATCH] gnu: petsc: Remove arch version from uname output Lars Bilke
2024-11-19 14:18 ` [bug#74416] [PATCH v2 1/2] " Lars Bilke
2024-11-19 14:18 ` Lars Bilke [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=663600da2062af7334e0406a752cd571bf627ce0.1732025886.git.lars.bilke@ufz.de \
--to=lars.bilke@ufz.de \
--cc=74416@debbugs.gnu.org \
--cc=andreas@enge.fr \
--cc=bavier@posteo.net \
--cc=sharlatanus@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).