| 1 |
commit: 67a1886bdb446cfcbfa82b1a3e9caa4b5c74bb73 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 1 05:31:19 2017 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 1 05:40:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a1886b |
| 7 |
|
| 8 |
sys-block/fio: add a configure flag to control rdma deps #542640 |
| 9 |
|
| 10 |
sys-block/fio/files/fio-2.2.15-rdma.patch | 52 +++++++++++++++++++++++++++++++ |
| 11 |
sys-block/fio/fio-2.15.ebuild | 2 ++ |
| 12 |
sys-block/fio/fio-2.16.ebuild | 2 ++ |
| 13 |
3 files changed, 56 insertions(+) |
| 14 |
|
| 15 |
diff --git a/sys-block/fio/files/fio-2.2.15-rdma.patch b/sys-block/fio/files/fio-2.2.15-rdma.patch |
| 16 |
new file mode 100644 |
| 17 |
index 00000000000..3ca9198840e |
| 18 |
--- /dev/null |
| 19 |
+++ b/sys-block/fio/files/fio-2.2.15-rdma.patch |
| 20 |
@@ -0,0 +1,52 @@ |
| 21 |
+From fd6d9c789bcb8b7c7b1edf34249e034094d341fc Mon Sep 17 00:00:00 2001 |
| 22 |
+From: Mike Frysinger <vapier@g.o> |
| 23 |
+Date: Tue, 28 Feb 2017 22:25:58 -0700 |
| 24 |
+Subject: [PATCH] configure: add a --disable-rdma flag to control rdma deps |
| 25 |
+ |
| 26 |
+Signed-off-by: Mike Frysinger <vapier@g.o> |
| 27 |
+--- |
| 28 |
+ configure | 7 +++++-- |
| 29 |
+ 1 file changed, 5 insertions(+), 2 deletions(-) |
| 30 |
+ |
| 31 |
+diff --git a/configure b/configure |
| 32 |
+index 15b87fac0e4c..187ac3583805 100755 |
| 33 |
+--- a/configure |
| 34 |
++++ b/configure |
| 35 |
+@@ -166,6 +166,8 @@ for opt do |
| 36 |
+ ;; |
| 37 |
+ --disable-numa) disable_numa="yes" |
| 38 |
+ ;; |
| 39 |
++ --disable-rdma) disable_rdma="yes" |
| 40 |
++ ;; |
| 41 |
+ --disable-rbd) disable_rbd="yes" |
| 42 |
+ ;; |
| 43 |
+ --disable-rbd-blkin) disable_rbd_blkin="yes" |
| 44 |
+@@ -204,6 +206,7 @@ if test "$show_help" = "yes" ; then |
| 45 |
+ echo "--esx Configure build options for esx" |
| 46 |
+ echo "--enable-gfio Enable building of gtk gfio" |
| 47 |
+ echo "--disable-numa Disable libnuma even if found" |
| 48 |
++ echo "--disable-rdma Disable RDMA support even if found" |
| 49 |
+ echo "--disable-gfapi Disable gfapi" |
| 50 |
+ echo "--enable-libhdfs Enable hdfs support" |
| 51 |
+ echo "--disable-lex Disable use of lex/yacc for math" |
| 52 |
+@@ -642,7 +645,7 @@ int main(int argc, char **argv) |
| 53 |
+ return 0; |
| 54 |
+ } |
| 55 |
+ EOF |
| 56 |
+-if compile_prog "" "-libverbs" "libverbs" ; then |
| 57 |
++if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then |
| 58 |
+ libverbs="yes" |
| 59 |
+ LIBS="-libverbs $LIBS" |
| 60 |
+ fi |
| 61 |
+@@ -660,7 +663,7 @@ int main(int argc, char **argv) |
| 62 |
+ return 0; |
| 63 |
+ } |
| 64 |
+ EOF |
| 65 |
+-if compile_prog "" "-lrdmacm" "rdma"; then |
| 66 |
++if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then |
| 67 |
+ rdmacm="yes" |
| 68 |
+ LIBS="-lrdmacm $LIBS" |
| 69 |
+ fi |
| 70 |
+-- |
| 71 |
+2.11.1 |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild |
| 75 |
index 1158dbdae90..8080c1b7e60 100644 |
| 76 |
--- a/sys-block/fio/fio-2.15.ebuild |
| 77 |
+++ b/sys-block/fio/fio-2.15.ebuild |
| 78 |
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch |
| 82 |
+ epatch "${FILESDIR}"/fio-2.2.15-rdma.patch #542640 |
| 83 |
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die |
| 84 |
epatch_user |
| 85 |
|
| 86 |
@@ -63,6 +64,7 @@ src_configure() { |
| 87 |
$(usex gtk '--enable-gfio' '') \ |
| 88 |
$(usex numa '' '--disable-numa') \ |
| 89 |
$(usex rbd '' '--disable-rbd') \ |
| 90 |
+ $(usex rdma '' '--disable-rdma') \ |
| 91 |
$(usex static '--build-static' '') |
| 92 |
echo "$@" |
| 93 |
"$@" || die 'configure failed' |
| 94 |
|
| 95 |
diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild |
| 96 |
index c57607e80a2..64a01dc145f 100644 |
| 97 |
--- a/sys-block/fio/fio-2.16.ebuild |
| 98 |
+++ b/sys-block/fio/fio-2.16.ebuild |
| 99 |
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}" |
| 100 |
|
| 101 |
PATCHES=( |
| 102 |
"${FILESDIR}"/fio-2.2.13-libmtd.patch |
| 103 |
+ "${FILESDIR}"/fio-2.2.15-rdma.patch #542640 |
| 104 |
) |
| 105 |
|
| 106 |
src_prepare() { |
| 107 |
@@ -66,6 +67,7 @@ src_configure() { |
| 108 |
$(usex gtk '--enable-gfio' '') \ |
| 109 |
$(usex numa '' '--disable-numa') \ |
| 110 |
$(usex rbd '' '--disable-rbd') \ |
| 111 |
+ $(usex rdma '' '--disable-rdma') \ |
| 112 |
$(usex static '--build-static' '') |
| 113 |
echo "$@" |
| 114 |
"$@" || die 'configure failed' |
Archives