diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2026-01-05 16:08:56 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-01-09 15:22:46 +0100 |
| commit | 97c360a09c8c8e12816574dadc5135f02ac5d5b0 (patch) | |
| tree | 6d7216ce30f67956e7e5f133e13562ac7735a454 /gnu | |
| parent | 552ca46e7b33ea9567e98cd9cf69a74b263872e4 (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')
| -rw-r--r-- | gnu/packages/parallel.scm | 28 |
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 @@ ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019-2026 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop> @@ -815,10 +815,7 @@ commonly needed services in distributed and parallel computing systems.") (build-system gnu-build-system) (arguments (list #:configure-flags - #~(list (string-append "--with-hwloc=" - (assoc-ref %build-inputs "hwloc")) - (string-append "--with-pmix=" - #$(this-package-input "openpmix"))) + #~(list "--disable-static") #:phases #~(modify-phases %standard-phases @@ -838,13 +835,28 @@ commonly needed services in distributed and parallel computing systems.") (substitute* "src/runtime/prte_mca_params.c" (("prte_launch_agent =.*") (string-append "prte_launch_agent = \"" - #$output "/bin/prted\";\n")))))) + #$output "/bin/prted\";\n"))))) + (add-after 'install 'adjust-pcc-link + (lambda* (#:key inputs #:allow-other-keys) + ;; Adjust the 'pcc' symlink to its points to 'pmixcc' using + ;; its absolute file name instead of just 'pmixcc'. + (let* ((pcc (string-append #$output "/bin/pcc")) + (target (string-append "/bin/" (readlink pcc)))) + (delete-file pcc) + (symlink (search-input-file inputs target) + pcc))))) #:disallowed-references (list (canonical-package gcc)))) (inputs (list libevent `(,hwloc "lib") - openpmix)) - (native-inputs (list perl)) + openpmix + libnl)) + (native-inputs (list pkg-config perl)) + (outputs '("out" + + ;; Move ~5 MiB of HTML docs (including CSS, JS, and fonts!) to a + ;; separate output. + "doc")) (synopsis "PMIx Reference RunTime Environment (PRRTE)") (description "The PMIx Reference RunTime Environment is a runtime environment |