summary refs log tree commit diff
path: root/gnu/packages/admin.scm
diff options
context:
space:
mode:
authorJohn Kehayias <john.kehayias@protonmail.com>2023-11-21 18:11:10 -0500
committerJohn Kehayias <john.kehayias@protonmail.com>2023-11-21 18:11:30 -0500
commit8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a (patch)
tree0e0f0cc9d5fa5a3c783451d12b10ebdb4c0aafe9 /gnu/packages/admin.scm
parentd1b786fe629ae9a80f37f64fdf48b9d7c132cd11 (diff)
parent42be8fa560a7554ac35801b46c3a0a007fd742ce (diff)
downloadguix-8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a.tar.gz
Merge branch 'master' into mesa-updates
Change-Id: I94c6874e5fdf916e3eb911f1a7df610cd3275474
Diffstat (limited to 'gnu/packages/admin.scm')
-rw-r--r--gnu/packages/admin.scm18
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index afbcf7fda6..17225863d7 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4432,6 +4432,9 @@ late.")
                      " *lmonpl = '\\0'"))
                   #t))))
     (build-system gnu-build-system)
+    (arguments
+     ;; GCC 11 defaults to c++17 but this package needs something older.
+     (list #:configure-flags #~'("CXXFLAGS=-std=c++14 -O2 -g")))
     (inputs
      (list openmpi
            munge
@@ -4439,7 +4442,7 @@ late.")
            libelf
            libgcrypt
            libgpg-error))
-    (synopsis "Infrastructue for large scale tool daemon launching")
+    (synopsis "Infrastructure for large-scale tool daemon launching")
     (description
      "LaunchMON is a software infrastructure that enables HPC run-time
 tools to co-locate tool daemons with a parallel job.  Its API allows a
@@ -4452,7 +4455,7 @@ launch daemons into the relevant nodes.")
 (define-public spindle
   (package
     (name "spindle")
-    (version "0.10")
+    (version "0.13")
     (source (origin
               ;; We use git checkout to avoid github auto-generated tarballs
               (method git-fetch)
@@ -4462,16 +4465,15 @@ launch daemons into the relevant nodes.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "15n3ay0qq81r5v7fif61q1vdjcq44pp2nynkh3fvbzc9fj3c39wd"))))
+                "1z594nhash1him9v00qmyqv9jvikzrs4wxqy1cvnfwqwnrrkp707"))))
     (build-system gnu-build-system)
     (arguments '(#:configure-flags '("--enable-sec-launchmon"
                                      "--enable-sec-munge"
-                                     "--enable-sec-none")))
+                                     "--enable-sec-none"
+                                     ;; Fails to build as c++17.
+                                     "CXXFLAGS=-std=c++14 -O2 -g")))
     (inputs
-     `(("mpi" ,openmpi)
-       ("munge" ,munge)
-       ("launchmon" ,launchmon)
-       ("libgcrypt" ,libgcrypt)))
+     (list openmpi munge launchmon libgcrypt))
     (synopsis "Scalable library loading in HPC environments")
     (description
      "Spindle is a tool for improving the performance of dynamic library and