From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B99D5139695 for ; Wed, 1 Mar 2017 05:41:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08B0321C075; Wed, 1 Mar 2017 05:41:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBCC721C075 for ; Wed, 1 Mar 2017 05:41:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 677983416BB for ; Wed, 1 Mar 2017 05:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4E8A5857 for ; Wed, 1 Mar 2017 05:41:34 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1488346855.67a1886bdb446cfcbfa82b1a3e9caa4b5c74bb73.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/fio/files/fio-2.2.15-rdma.patch sys-block/fio/fio-2.15.ebuild sys-block/fio/fio-2.16.ebuild X-VCS-Directories: sys-block/fio/ sys-block/fio/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 67a1886bdb446cfcbfa82b1a3e9caa4b5c74bb73 X-VCS-Branch: master Date: Wed, 1 Mar 2017 05:41:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f806122d-c6bd-4bf8-92a9-7ba628ab80ed X-Archives-Hash: 9574fcb558fe2d2e0ad8a1015764968c commit: 67a1886bdb446cfcbfa82b1a3e9caa4b5c74bb73 Author: Mike Frysinger gentoo org> AuthorDate: Wed Mar 1 05:31:19 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Mar 1 05:40:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a1886b sys-block/fio: add a configure flag to control rdma deps #542640 sys-block/fio/files/fio-2.2.15-rdma.patch | 52 +++++++++++++++++++++++++++++++ sys-block/fio/fio-2.15.ebuild | 2 ++ sys-block/fio/fio-2.16.ebuild | 2 ++ 3 files changed, 56 insertions(+) diff --git a/sys-block/fio/files/fio-2.2.15-rdma.patch b/sys-block/fio/files/fio-2.2.15-rdma.patch new file mode 100644 index 00000000000..3ca9198840e --- /dev/null +++ b/sys-block/fio/files/fio-2.2.15-rdma.patch @@ -0,0 +1,52 @@ +From fd6d9c789bcb8b7c7b1edf34249e034094d341fc Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 28 Feb 2017 22:25:58 -0700 +Subject: [PATCH] configure: add a --disable-rdma flag to control rdma deps + +Signed-off-by: Mike Frysinger +--- + configure | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 15b87fac0e4c..187ac3583805 100755 +--- a/configure ++++ b/configure +@@ -166,6 +166,8 @@ for opt do + ;; + --disable-numa) disable_numa="yes" + ;; ++ --disable-rdma) disable_rdma="yes" ++ ;; + --disable-rbd) disable_rbd="yes" + ;; + --disable-rbd-blkin) disable_rbd_blkin="yes" +@@ -204,6 +206,7 @@ if test "$show_help" = "yes" ; then + echo "--esx Configure build options for esx" + echo "--enable-gfio Enable building of gtk gfio" + echo "--disable-numa Disable libnuma even if found" ++ echo "--disable-rdma Disable RDMA support even if found" + echo "--disable-gfapi Disable gfapi" + echo "--enable-libhdfs Enable hdfs support" + echo "--disable-lex Disable use of lex/yacc for math" +@@ -642,7 +645,7 @@ int main(int argc, char **argv) + return 0; + } + EOF +-if compile_prog "" "-libverbs" "libverbs" ; then ++if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then + libverbs="yes" + LIBS="-libverbs $LIBS" + fi +@@ -660,7 +663,7 @@ int main(int argc, char **argv) + return 0; + } + EOF +-if compile_prog "" "-lrdmacm" "rdma"; then ++if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then + rdmacm="yes" + LIBS="-lrdmacm $LIBS" + fi +-- +2.11.1 + diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild index 1158dbdae90..8080c1b7e60 100644 --- a/sys-block/fio/fio-2.15.ebuild +++ b/sys-block/fio/fio-2.15.ebuild @@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch + epatch "${FILESDIR}"/fio-2.2.15-rdma.patch #542640 sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die epatch_user @@ -63,6 +64,7 @@ src_configure() { $(usex gtk '--enable-gfio' '') \ $(usex numa '' '--disable-numa') \ $(usex rbd '' '--disable-rbd') \ + $(usex rdma '' '--disable-rdma') \ $(usex static '--build-static' '') echo "$@" "$@" || die 'configure failed' diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild index c57607e80a2..64a01dc145f 100644 --- a/sys-block/fio/fio-2.16.ebuild +++ b/sys-block/fio/fio-2.16.ebuild @@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/fio-2.2.13-libmtd.patch + "${FILESDIR}"/fio-2.2.15-rdma.patch #542640 ) src_prepare() { @@ -66,6 +67,7 @@ src_configure() { $(usex gtk '--enable-gfio' '') \ $(usex numa '' '--disable-numa') \ $(usex rbd '' '--disable-rbd') \ + $(usex rdma '' '--disable-rdma') \ $(usex static '--build-static' '') echo "$@" "$@" || die 'configure failed'