summaryrefslogtreecommitdiff
path: root/gnu/packages/parallel.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludovic.courtes@inria.fr>2026-01-05 16:08:56 +0100
committerLudovic Courtès <ludo@gnu.org>2026-01-09 15:22:46 +0100
commit97c360a09c8c8e12816574dadc5135f02ac5d5b0 (patch)
tree6d7216ce30f67956e7e5f133e13562ac7735a454 /gnu/packages/parallel.scm
parent552ca46e7b33ea9567e98cd9cf69a74b263872e4 (diff)
gnu: prrte: Fix compilation.
The upgrade in 710d1984576a023878323e91b56f5c62b4a76271 turned out to be broken. * gnu/packages/parallel.scm (prrte)[arguments]: Remove now unnecessary configure flags. Add ‘adjust-pcc-link’ phase. [native-inputs]: Add ‘pkg-config’. [inputs]: Add ‘libnl’. [outputs]: New field. Fixes: guix/guix#4905 Reported-by: Andreas Enge <andreas@enge.fr> Change-Id: I84f74cadfa05e84939f7db0b51ce4a1cb516d185 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Merges: #5391
Diffstat (limited to 'gnu/packages/parallel.scm')
-rw-r--r--gnu/packages/parallel.scm28
1 files changed, 20 insertions, 8 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 6858ad41552..853e22c4d0b 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -9,7 +9,7 @@
9;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> 9;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
10;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> 10;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
11;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> 11;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
12;;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org> 12;;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org>
13;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> 13;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
14;;; Copyright © 2020 Roel Janssen <roel@gnu.org> 14;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
15;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop> 15;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
@@ -815,10 +815,7 @@ commonly needed services in distributed and parallel computing systems.")
815 (build-system gnu-build-system) 815 (build-system gnu-build-system)
816 (arguments 816 (arguments
817 (list #:configure-flags 817 (list #:configure-flags
818 #~(list (string-append "--with-hwloc=" 818 #~(list "--disable-static")
819 (assoc-ref %build-inputs "hwloc"))
820 (string-append "--with-pmix="
821 #$(this-package-input "openpmix")))
822 819
823 #:phases 820 #:phases
824 #~(modify-phases %standard-phases 821 #~(modify-phases %standard-phases
@@ -838,13 +835,28 @@ commonly needed services in distributed and parallel computing systems.")
838 (substitute* "src/runtime/prte_mca_params.c" 835 (substitute* "src/runtime/prte_mca_params.c"
839 (("prte_launch_agent =.*") 836 (("prte_launch_agent =.*")
840 (string-append "prte_launch_agent = \"" 837 (string-append "prte_launch_agent = \""
841 #$output "/bin/prted\";\n")))))) 838 #$output "/bin/prted\";\n")))))
839 (add-after 'install 'adjust-pcc-link
840 (lambda* (#:key inputs #:allow-other-keys)
841 ;; Adjust the 'pcc' symlink to its points to 'pmixcc' using
842 ;; its absolute file name instead of just 'pmixcc'.
843 (let* ((pcc (string-append #$output "/bin/pcc"))
844 (target (string-append "/bin/" (readlink pcc))))
845 (delete-file pcc)
846 (symlink (search-input-file inputs target)
847 pcc)))))
842 848
843 #:disallowed-references (list (canonical-package gcc)))) 849 #:disallowed-references (list (canonical-package gcc))))
844 (inputs (list libevent 850 (inputs (list libevent
845 `(,hwloc "lib") 851 `(,hwloc "lib")
846 openpmix)) 852 openpmix
847 (native-inputs (list perl)) 853 libnl))
854 (native-inputs (list pkg-config perl))
855 (outputs '("out"
856
857 ;; Move ~5 MiB of HTML docs (including CSS, JS, and fonts!) to a
858 ;; separate output.
859 "doc"))
848 (synopsis "PMIx Reference RunTime Environment (PRRTE)") 860 (synopsis "PMIx Reference RunTime Environment (PRRTE)")
849 (description 861 (description
850 "The PMIx Reference RunTime Environment is a runtime environment 862 "The PMIx Reference RunTime Environment is a runtime environment