From patchwork Tue Feb 28 16:23:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9596223 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6FCA9601D7 for ; Tue, 28 Feb 2017 16:25:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62C8E204C2 for ; Tue, 28 Feb 2017 16:25:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 574A626BE9; Tue, 28 Feb 2017 16:25:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CED2A204C2 for ; Tue, 28 Feb 2017 16:25:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SGOWGZ047627; Tue, 28 Feb 2017 11:24:32 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1SGNwXt005895 for ; Tue, 28 Feb 2017 11:23:58 -0500 Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SGNva8023006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 28 Feb 2017 11:23:57 -0500 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0AAABC057FA9 for ; Tue, 28 Feb 2017 16:23:57 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8509CAD7C for ; Tue, 28 Feb 2017 16:23:54 +0000 (UTC) From: Martin Wilck To: dm-devel@redhat.com Date: Tue, 28 Feb 2017 17:23:28 +0100 Message-Id: <20170228162329.14517-33-mwilck@suse.com> In-Reply-To: <20170228162329.14517-1-mwilck@suse.com> References: <20170228162329.14517-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 202 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 28 Feb 2017 16:23:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 28 Feb 2017 16:23:57 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -1.501 (BAYES_50, RCVD_IN_DNSWL_MED, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 32/33] libmultipath/checkers: make RADOS checker optional X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP Some distros lack the rados header files. Use "make ENABLE_RADOS=0" on such distributions to build multipath-tools in such cases. The default (to enable RADOS support) remains unchanged. Signed-off-by: Martin Wilck --- Makefile.inc | 3 +++ libmultipath/checkers/Makefile | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 93d8e340..b5e910f9 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -8,6 +8,9 @@ # # WITH_LOCAL_LIBDM = 1 # WITH_LOCAL_LIBSYSFS = 1 +# +# Uncomment to disable RADOS support (e.g. if rados headers are missing). +# ENABLE_RADOS = 0 ifeq ($(TOPDIR),) TOPDIR = .. diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile index 11ab76f6..4970fc07 100644 --- a/libmultipath/checkers/Makefile +++ b/libmultipath/checkers/Makefile @@ -13,8 +13,10 @@ LIBS= \ libcheckdirectio.so \ libcheckemc_clariion.so \ libcheckhp_sw.so \ - libcheckrdac.so \ - libcheckrbd.so + libcheckrdac.so +ifneq ($(ENABLE_RADOS),0) +LIBS += libcheckrbd.so +endif all: $(LIBS)