Subject: [PATCH 1/2] gnu: openmpi@5: Remove reference to GCC and other build tools.

From: Ludovic Courtès <[email-masked]>
Date: Tue, 15 Oct 2024 14:45:03 +0200

From: Ludovic Courtès <[email-masked]>

This removes GCC from the direct references of openmpi@5.

* gnu/packages/mpi.scm (openmpi-5)[arguments]: Replace arguments
entirely instead of using ‘substitute-keyword-arguments’.  Reintroduce
‘remove-absolute’ phase.  Remove ‘find-opensm-headers’ and ‘remove-logs’
phases, which are no longer needed.

Change-Id: Ia3b25230488ca13310cd5bb2ae45f6990e906fa5
---
 gnu/packages/mpi.scm | 59 +++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 75cfd4af66..6e1f972eb8 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -339,37 +339,46 @@ (define-public openmpi-5
 
     (outputs '("out" "debug"))
     (arguments
-     (substitute-keyword-arguments (package-arguments openmpi)
-       ((#:configure-flags _)
-        #~(list "--enable-mpi-ext=affinity" ;cr doesn't work
-                "--with-sge"
+     (list #:configure-flags
+           #~(list "--enable-mpi-ext=affinity"         ;cr doesn't work
+                   "--with-sge"
 
-                #$@(if (package? (this-package-input "valgrind"))
-                       #~("--enable-memchecker"
-                          "--with-valgrind")
-                       #~("--without-valgrind"))
+                   #$@(if (package? (this-package-input "valgrind"))
+                          #~("--enable-memchecker"
+                             "--with-valgrind")
+                          #~("--without-valgrind"))
 
-                "--with-hwloc=external"
-                "--with-libevent"
+                   "--with-hwloc=external"
+                   "--with-libevent"
 
-                ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated
-                ;; since 5.x.
-                "--enable-prte-prefix-by-default"
+                   ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated
+                   ;; since 5.x.
+                   "--enable-prte-prefix-by-default"
 
-                ;; Enable support for the 'Process Management Interface for Exascale'
-                ;; (PMIx) used e.g. by Slurm for the management communication and
-                ;; coordination of MPI processes.
-                (string-append "--with-pmix=" #$(this-package-input "openpmix"))
-                (string-append "--with-prrte=" #$(this-package-input "prrte"))
+                   ;; Enable support for the 'Process Management Interface for Exascale'
+                   ;; (PMIx) used e.g. by Slurm for the management communication and
+                   ;; coordination of MPI processes.
+                   (string-append "--with-pmix=" #$(this-package-input "openpmix"))
+                   (string-append "--with-prrte=" #$(this-package-input "prrte"))
 
-                ;; Since 5.x, Infiniband support is provided by ucx.
-                ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
-                (string-append "--with-ucx=" #$(this-package-input "ucx"))))
+                   ;; Since 5.x, Infiniband support is provided by ucx.
+                   ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes
+                   (string-append "--with-ucx=" #$(this-package-input "ucx")))
 
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (delete 'remove-absolute)
-            (delete 'scrub-timestamps)))))))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'build 'remove-absolute
+                 (lambda _
+                   ;; Remove compiler absolute file names (OPAL_FC_ABSOLUTE
+                   ;; etc.) to reduce the closure size.  See
+                   ;; <https://lists.gnu.org/archive/html/guix-devel/2017-07/msg00388.html>
+                   ;; and
+                   ;; <https://www.mail-archive.com/[email-masked]//msg31397.html>.
+                   (substitute* '("oshmem/tools/oshmem_info/param.c"
+                                  "ompi/tools/ompi_info/param.c")
+                     (("_ABSOLUTE") "")))))
+
+           #:disallowed-references (list (canonical-package gcc))))))
 
 (define-public openmpi-c++
   (package/inherit openmpi
-- 
2.46.0