From e68f954eb3c39366cb72dde0348d0c5348316dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 8 Nov 2019 17:57:06 +0100 Subject: [PATCH] gnu: rdma-core: Update to 26.0. * gnu/packages/linux.scm (rdma-core): Update to 26.0. [arguments]: Add "-DRST2MAN_EXECUTABLE=..." to #:configure-flags. [native-inputs]: Add PYTHON-DOCUTILS. --- gnu/packages/linux.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 92c9e7fca3..e972e709c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -100,6 +100,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages popt) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rrdtool) #:use-module (gnu packages samba) @@ -4306,7 +4307,7 @@ (define-public ntfs-3g (define-public rdma-core (package (name "rdma-core") - (version "22.3") + (version "26.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -4314,16 +4315,21 @@ (define-public rdma-core version ".tar.gz")) (sha256 (base32 - "0jgp1xh328x0kr6lkn4vq71cc627zd05wczr74b3j3151flhj828")))) + "14raqwx4pkzghiwkx1v0dq338f7xqqx8rnsxlpdnngvjy1p5l79j")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ; no tests + `(#:tests? #f ; no tests ;; Upstream uses the "ninja" build system and encourage distros ;; to do the same for consistency. They also recommend using the ;; "Release" build type. #:build-type "Release" #:configure-flags (list "-GNinja" + (string-append "-DRST2MAN_EXECUTABLE=" + (assoc-ref %build-inputs + "python-docutils") + "/bin/rst2man.py") + ;; On some configurations, the ;; IB_USER_MAD_REGISTER_AGENT ioctl, which is ;; used by default, would return ENODEV. To @@ -4342,7 +4348,8 @@ (define-public rdma-core (native-inputs `(("ninja" ,ninja) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils))) ;for 'rst2man' (inputs `(("libnl" ,libnl) ("udev" ,eudev)))