diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
commit | 2c11e7be745a790320a42a357635997310d731d0 (patch) | |
tree | 226aafaccf6f77758ab6e0e174ff8f08318a1772 /gnu/packages/parallel.scm | |
parent | e12210dc92098d8581cea3007d57dbb6be16bb41 (diff) | |
parent | 041d62f7cc244d7f6c0bd6d60cdf08e72d400313 (diff) |
Merge remote-tracking branch 'origin/master' into wip-ungrafting
Diffstat (limited to 'gnu/packages/parallel.scm')
-rw-r--r-- | gnu/packages/parallel.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 05964cd038..17e2a7f7fe 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 @@ -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 _ |