Explorar el Código

build: make RDMA support an RPM build conditional

Enable RDMA in RPM builds by default to maintain the previous behavior
(which always included --enable-rdma in the %configure invocation).

Signed-off-by: Florian Haas <florian.haas@linbit.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Florian Haas hace 14 años
padre
commit
17fb819af1
Se han modificado 1 ficheros con 5 adiciones y 0 borrados
  1. 5 0
      corosync.spec.in

+ 5 - 0
corosync.spec.in

@@ -10,6 +10,7 @@
 %bcond_with monitoring
 %bcond_with monitoring
 %bcond_with snmp
 %bcond_with snmp
 %bcond_with dbus
 %bcond_with dbus
+%bcond_without rdma
 
 
 Name: corosync
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
@@ -36,7 +37,9 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
 BuildRequires: autoconf automake
 BuildRequires: autoconf automake
 %endif
 %endif
 BuildRequires: nss-devel
 BuildRequires: nss-devel
+%if %{with rdma}
 BuildRequires: libibverbs-devel librdmacm-devel
 BuildRequires: libibverbs-devel librdmacm-devel
+%endif
 %if %{with snmp}
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 BuildRequires: net-snmp-devel
 %endif
 %endif
@@ -75,7 +78,9 @@ export rdmacm_LIBS=-lrdmacm \
 %if %{with dbus}
 %if %{with dbus}
 	--enable-dbus \
 	--enable-dbus \
 %endif
 %endif
+%if %{with rdma}
 	--enable-rdma \
 	--enable-rdma \
+%endif
 	--with-initddir=%{_initrddir}
 	--with-initddir=%{_initrddir}
 
 
 make %{_smp_mflags}
 make %{_smp_mflags}