From 39f48a390a032f960a0b35e9bef48d727e1c5d12 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jul 09 2010 11:10:57 +0000 Subject: - no InfiniBand stack on s390(x) --- diff --git a/corosync.spec b/corosync.spec index 0141caf..c716be1 100644 --- a/corosync.spec +++ b/corosync.spec @@ -3,7 +3,7 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces Version: 1.2.6 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} License: BSD Group: System Environment/Base URL: http://ftp.corosync.org @@ -19,6 +19,13 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89 # Build bits +# no InfiniBand stack on s390(x) +%ifarch s390 s390x +%define have_ib 0 +%else +%define have_ib 1 +%endif + %define buildtrunk 0 %{?_with_buildtrunk: %define buildtrunk 1} @@ -26,7 +33,9 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89 BuildRequires: autoconf automake %endif BuildRequires: nss-devel +%if %{have_ib} BuildRequires: libibverbs-devel librdmacm-devel +%endif BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -39,13 +48,17 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ./autogen.sh %endif +%if %{have_ib} export ibverbs_CFLAGS=-I/usr/include/infiniband \ export ibverbs_LIBS=-libverbs \ export rdmacm_CFLAGS=-I/usr/include/rdma \ export rdmacm_LIBS=-lrdmacm \ +%endif %{configure} \ --enable-nss \ +%if %{have_ib} --enable-rdma \ +%endif --with-initddir=%{_initrddir} make %{_smp_mflags} @@ -224,6 +237,9 @@ The Corosync Cluster Engine APIs. %{_mandir}/man8/sam_overview.8* %changelog +* Fri Jul 9 2010 Dan Horák - 1.2.6-2 +- no InfiniBand stack on s390(x) + * Mon Jul 5 2010 Fabio M. Di Nitto - 1.2.6-1 - New upstream release - Resync spec file with upstream changes