diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-16 18:13:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-16 20:09:53 +0200 |
| commit | cfdd023bed634040ab3256680aebc8e06c134bd1 (patch) | |
| tree | 10be0cd49ce69bb80d1d936f8c01f8d0b2496a60 /gnu/packages/linux.scm | |
| parent | d1ed1d7560d454e271f682728a3dcaa76032077f (diff) | |
| download | guix-patches-cfdd023bed634040ab3256680aebc8e06c134bd1.tar guix-patches-cfdd023bed634040ab3256680aebc8e06c134bd1.tar.gz | |
gnu: multipath-tools: Update to 0.8.4.
* gnu/packages/patches/multipath-tools-sans-systemd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/linux.scm (multipath-tools): Update to 0.8.4.
[source](patches): New field.
[arguments]: Add #:parallel-build?. Add phase to fix erroneous compiler warning.
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 793036a3ff..2d8acea0e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4182,7 +4182,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) (uri (git-reference @@ -4191,7 +4191,8 @@ arrays when needed.") (file-name (git-file-name name version)) (sha256 (base32 - "02kdbk3gv3fx5dg445scz3l4lg0sznlv037qkjgpw9xkw4l50cfd")) + "14n8pcgnliicqxzc40xvjxk4cafm4qx7a3rsx5qva74r3ydzx8rn")) + (patches (search-patches "multipath-tools-sans-systemd.patch")) (modules '((guix build utils))) (snippet '(begin @@ -4205,9 +4206,12 @@ arrays when needed.") (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests + #:parallel-build? #f ;XXX: broken in 0.8.4 #:make-flags (list "CC=gcc" (string-append "DESTDIR=" (assoc-ref %outputs "out")) + ;; Install Udev rules below this directory, relative + ;; to the prefix. "SYSTEMDPATH=lib" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") @@ -4229,6 +4233,15 @@ arrays when needed.") (("/usr/include/libudev.h") (string-append udev "/include/libudev.h"))) #t))) + (add-after 'unpack 'fix-maybe-uninitialized-variable + (lambda _ + ;; This variable gets initialized later if needed, but GCC 7 + ;; fails to notice. Should be fixed for > 0.8.4. + ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html + (substitute* "libmultipath/structs_vec.c" + (("bool is_queueing;") + "bool is_queueing = false;")) + #t)) (delete 'configure)))) ; no configure script (native-inputs `(("perl" ,perl) |