Fix build on arm

Fix files for arm
OpenMPI 2.1 does not support hwloc 2.X in Fedora 31+
2020-02-15 14:57:51 -07:00 · 2019-10-24 17:58:06 -06:00 · 2019-10-24 17:16:27 -06:00
1 changed files with 7 additions and 2 deletions
--- a/openmpi.spec
+++ b/openmpi.spec
@ -21,7 +21,7 @@

 Name:			openmpi%{?_cc_name_suffix}
 Version:		2.1.6
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Open Message Passing Interface
 License:		BSD and MIT and Romio
 URL:			http://www.open-mpi.org/
@ -166,7 +166,9 @@ OpenMPI support for Python 3.
 	--with-valgrind \
 	--enable-memchecker \
 %endif
+%if ! (0%{?fedora} >= 31)
 	--with-hwloc=/usr \
+%endif
 	CC=%{opt_cc} CXX=%{opt_cxx} \
 	LDFLAGS='%{__global_ldflags}' \
 	CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
@ -264,7 +266,7 @@ make check
 %dir %{_libdir}/%{name}/share/openmpi
 %{_libdir}/%{name}/share/openmpi/amca-param-sets
 %{_libdir}/%{name}/share/openmpi/help*.txt
-%ifnarch s390 %{arm}
+%ifnarch %{arm}
 %{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
 %endif

@ -310,6 +312,9 @@ make check


 %changelog
+* Sat Feb 15 2020 Orion Poplawski <orion@nwra.com> - 2.1.6-2
+- Fix build on arm
+
 * Sat Feb 2 2019 Orion Poplawski <orion@nwra.com> - 2.1.6-1
 - Update to 2.1.6
Author	SHA1	Message	Date
Orion Poplawski	279547d0c4	Fix build on arm	2020-02-15 14:57:51 -07:00
Orion Poplawski	6d60f5b520	Fix files for arm	2019-10-24 17:58:06 -06:00
Orion Poplawski	c41ab2e454	OpenMPI 2.1 does not support hwloc 2.X in Fedora 31+	2019-10-24 17:16:27 -06:00