diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 15:42:40 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 16:32:47 +0200 |
| commit | 7f412f335d93ce8bdc12fb90230be627905b6fdb (patch) | |
| tree | 201026c1add8d5dab5758994a4482ad0015b2550 | |
| parent | b5fb9430ba29ef80661a7730717399bf54f7115b (diff) | |
| download | guix-7f412f335d93ce8bdc12fb90230be627905b6fdb.tar.gz | |
gnu: multipath-tools: Update to 0.7.1.
* gnu/packages/linux.scm (multipath-tools): Update to 0.7.1. [native-inputs]: Add PERL and PKG-CONFIG. [inputs]: Add JSON-C. [arguments]: Add two more substitutions in 'patch-source' phase.
| -rw-r--r-- | gnu/packages/linux.scm | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 968aa9b58f..548a8b0a98 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -86,6 +86,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) @@ -2606,7 +2607,7 @@ arrays when needed.") (define-public multipath-tools (package (name "multipath-tools") - (version "0.6.4") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append "http://git.opensvc.com/?p=multipath-tools/" @@ -2614,7 +2615,7 @@ arrays when needed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12smwmljrkl2afc06dghd2253rqnfawvzr818a2xpxr06f44f9qy")) + "0w0rgi3lqksaki30yvd4l5rgjqb0d7js1sh7masl8aw6xbrsm26p")) (modules '((guix build utils))) (snippet '(begin @@ -2637,19 +2638,29 @@ arrays when needed.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source - (lambda _ - (substitute* "Makefile.inc" - (("\\$\\(prefix\\)/usr") "$(prefix)")) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (let ((lvm2 (assoc-ref inputs "lvm2")) + (udev (assoc-ref inputs "udev"))) + (substitute* "Makefile.inc" + (("\\$\\(prefix\\)/usr") "$(prefix)")) + (substitute* '("kpartx/Makefile" "libmultipath/Makefile") + (("/usr/include/libdevmapper.h") + (string-append lvm2 "/include/libdevmapper.h")) + (("/usr/include/libudev.h") + (string-append udev "/include/libudev.h"))) + #t))) (delete 'configure) (add-before 'build 'set-CC (lambda _ (setenv "CC" "gcc") #t))))) (native-inputs - `(("valgrind" ,valgrind))) + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("valgrind" ,valgrind))) (inputs `(("ceph:lib" ,ceph "lib") + ("json-c" ,json-c) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) |