[qpid-cpp/f16] allow build without InfiniBand on s390(x)

Dan Horák sharkcz at fedoraproject.org
Mon Aug 20 13:49:13 UTC 2012


commit 8391b58ebf70c4ace81633bdeef219c0e4c1ed9d
Author: Dan Horák <dan at danny.cz>
Date:   Mon Aug 20 13:10:31 2012 +0200

    allow build without InfiniBand on s390(x)

 qpid-cpp.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 894bc21..d5fe89c 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -53,8 +53,10 @@ BuildRequires: cyrus-sasl
 BuildRequires: boost-program-options
 BuildRequires: boost-filesystem
 BuildRequires: libuuid-devel
+%ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
+%endif
 BuildRequires: nss-devel
 BuildRequires: nspr-devel
 BuildRequires: xqilla-devel
@@ -369,6 +371,7 @@ for ruby.
 
 
 
+%ifnarch s390 s390x
 %package -n qpid-cpp-client-rdma
 Summary:   RDMA Protocol support (including Infiniband) for Qpid clients
 
@@ -407,6 +410,7 @@ transport for AMQP messaging.
 %post -n qpid-cpp-server-rdma -p /sbin/ldconfig
 
 %postun -n qpid-cpp-server-rdma -p /sbin/ldconfig
+%endif
 
 
 
@@ -569,7 +573,11 @@ pushd cpp
 CXXFLAGS="%{optflags} -DNDEBUG -O3 -Wno-unused-result" \
 %configure --disable-static --with-swig --with-sasl --with-ssl --without-help2man \
 --with-swig \
+%ifnarch s390 s390x
 --with-rdma \
+%else
+--without-rdma \
+%endif
 --without-cpg \
 --with-xml
 ECHO=echo make %{LIB_VERSION_MAKE_PARAMS} %{?_smp_mflags}


More information about the scm-commits mailing list