unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#73163] [PATCH] gnu: openpmix: Do not keep a reference to GCC and other build tools.
@ 2024-09-10  8:38 Ludovic Courtès
  2024-09-10  8:48 ` [bug#73163] [PATCH v2] " Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2024-09-10  8:38 UTC (permalink / raw)
  To: 73163; +Cc: Ludovic Courtès, romain.garbage

From: Ludovic Courtès <ludovic.courtes@inria.fr>

This reduces the closure of ‘openpmix’ from 297 MiB to 93 MiB.

* gnu/packages/parallel.scm (openpmix)[arguments]: Add #:phases
and #:disallowed-references.

Change-Id: I231c550743e2854e431b8100584bd464695de695
---
 gnu/packages/parallel.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index d5a55a8641..d3ff363cd5 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages parallel)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freeipmi)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages maths)
@@ -646,7 +647,28 @@ (define-public openpmix
    (arguments
     (list #:configure-flags
           #~(list (string-append "--with-hwloc="
-                                 (ungexp (this-package-input "hwloc") "lib")))))
+                                 (ungexp (this-package-input "hwloc") "lib")))
+
+          ;; Don't keep a reference to GCC.
+          #:disallowed-references (and (not (%current-target-system))
+                                       (list (canonical-package gcc)))
+
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-before 'configure 'strip-pmix-config-header
+                (lambda _
+                  ;; The 'pmix_info' program prints the 'configure' command
+                  ;; line, compiler absolute file name, etc., which causes it
+                  ;; to keep references to many build-time packages.  Scrub
+                  ;; these.
+                  (substitute* "src/include/pmix_config.h.in"
+                    (("#define PMIX_CONFIGURE_CLI .*")
+                     "#define PMIX_CONFIGURE_CLI \"[scrubbed]\"\n"))
+
+                  (substitute* "configure"
+                    (("PMIX_CC_ABSOLUTE=\"(.*)\"" _ cc)
+                     (string-append "PMIX_CC_ABSOLUTE=\"$(basename \""
+                                    cc "\")\"\n"))))))))
    (inputs (list libevent `(,hwloc "lib")))
    (native-inputs (list perl python))
    (synopsis "PMIx library")

base-commit: 637ca78f513fac15284403c0d3af64492ea832a1
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#73163] [PATCH v2] gnu: openpmix: Do not keep a reference to GCC and other build tools.
  2024-09-10  8:38 [bug#73163] [PATCH] gnu: openpmix: Do not keep a reference to GCC and other build tools Ludovic Courtès
@ 2024-09-10  8:48 ` Ludovic Courtès
  2024-09-16  9:17   ` bug#73163: " Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2024-09-10  8:48 UTC (permalink / raw)
  To: 73163; +Cc: Ludovic Courtès, romain.garbage

From: Ludovic Courtès <ludovic.courtes@inria.fr>

This reduces the closure of ‘openpmix’ from 297 MiB to 93 MiB.

* gnu/packages/parallel.scm (openpmix)[arguments]: Add #:phases
and #:disallowed-references.

Change-Id: I231c550743e2854e431b8100584bd464695de695
---
 gnu/packages/parallel.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index d5a55a8641..a77894b8d6 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -52,6 +52,7 @@ (define-module (gnu packages parallel)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freeipmi)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages maths)
@@ -646,7 +647,29 @@ (define-public openpmix
    (arguments
     (list #:configure-flags
           #~(list (string-append "--with-hwloc="
-                                 (ungexp (this-package-input "hwloc") "lib")))))
+                                 (ungexp (this-package-input "hwloc") "lib")))
+
+          ;; Don't keep a reference to GCC.
+          #:disallowed-references (and (not (%current-target-system))
+                                       (list (canonical-package gcc)))
+
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-before 'configure 'strip-pmix-cc-absolute
+                (lambda _
+                  ;; The 'pmix_info' program prints the 'configure' command
+                  ;; line, compiler absolute file name, etc., which causes it
+                  ;; to keep references to many build-time packages.  Scrub
+                  ;; these.
+                  (substitute* "configure"
+                    (("PMIX_CC_ABSOLUTE=\"(.*)\"" _ cc)
+                     (string-append "PMIX_CC_ABSOLUTE=\"$(basename \""
+                                    cc "\")\"\n")))))
+              (add-after 'configure 'strip-pmix-config-header
+                (lambda _
+                  (substitute* "src/include/pmix_config.h"
+                    (("#define PMIX_CONFIGURE_CLI .*")
+                     "#define PMIX_CONFIGURE_CLI \"[scrubbed]\"\n")))))))
    (inputs (list libevent `(,hwloc "lib")))
    (native-inputs (list perl python))
    (synopsis "PMIx library")

base-commit: 637ca78f513fac15284403c0d3af64492ea832a1
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#73163: [PATCH v2] gnu: openpmix: Do not keep a reference to GCC and other build tools.
  2024-09-10  8:48 ` [bug#73163] [PATCH v2] " Ludovic Courtès
@ 2024-09-16  9:17   ` Ludovic Courtès
  0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2024-09-16  9:17 UTC (permalink / raw)
  To: 73163-done; +Cc: romain.garbage

Ludovic Courtès <ludo@gnu.org> skribis:

> From: Ludovic Courtès <ludovic.courtes@inria.fr>
>
> This reduces the closure of ‘openpmix’ from 297 MiB to 93 MiB.
>
> * gnu/packages/parallel.scm (openpmix)[arguments]: Add #:phases
> and #:disallowed-references.
>
> Change-Id: I231c550743e2854e431b8100584bd464695de695

Pushed as 3daab044145b4b39fe60c64e89f35e3b2a538935.




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-09-16  9:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-10  8:38 [bug#73163] [PATCH] gnu: openpmix: Do not keep a reference to GCC and other build tools Ludovic Courtès
2024-09-10  8:48 ` [bug#73163] [PATCH v2] " Ludovic Courtès
2024-09-16  9:17   ` bug#73163: " Ludovic Courtès

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).