From 799cc194f21b0f36f2b1cf83a47f75a30be56133 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 23 Apr 2021 18:37:15 +0200
Subject: gnu: parallel: Update to 20210422.

* gnu/packages/parallel.scm (parallel): Update to 20210422.
---
 gnu/packages/parallel.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/parallel.scm')

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 05964cd038..dcd28c792b 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -57,14 +57,14 @@
 (define-public parallel
   (package
     (name "parallel")
-    (version "20210322")
+    (version "20210422")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/parallel/parallel-"
                           version ".tar.bz2"))
       (sha256
-       (base32 "152np0jg4n94sbl2p2fzxjfnssiyp5sg7r5wx6s8p893b921pxwq"))))
+       (base32 "1s4ynlsh5fr5vxcf5xm45fcfyzp62zclzjq5b7rbwrs4chxnlgmy"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit 1.4.1


From d027637026f8aedabe5a0ceeb2c74d1d77d0109b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 28 Apr 2021 10:17:01 +0200
Subject: gnu: slurm: Link plugins with libslurm.

* gnu/packages/parallel.scm (slurm)[arguments]: Add phase
patch-plugin-linker-flags to link plugins with libslurm; run autoconf phase
after this new phase.
---
 gnu/packages/parallel.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/parallel.scm')

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index dcd28c792b..17e2a7f7fe 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -198,7 +198,12 @@ execution is also possible.")
             ,@(if (target-64bit?) '() '("--enable-deprecated")))
       #:phases
       (modify-phases %standard-phases
-        (add-after 'unpack 'autoconf
+        (add-after 'unpack 'patch-plugin-linker-flags
+          (lambda _
+            (substitute* (find-files "src/plugins/" "Makefile.in")
+              (("_la_LDFLAGS = ")
+               "_la_LDFLAGS = ../../../api/libslurm.la "))))
+        (add-after 'patch-plugin-linker-flags 'autoconf
           (lambda _ (invoke "autoconf")))         ;configure.ac was patched
         (add-after 'install 'install-libpmi
           (lambda _
-- 
cgit 1.4.1