From 87fa84a1a1df64b725bc55ef617a07c922fbc799 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 22 Jun 2023 03:51:37 -0400 Subject: [PATCH] Disable PSM, OrangeFS in RHEL builds This is based on c9s: https://gitlab.com/redhat/centos-stream/rpms/openmpi/-/commit/4bc1e69400a2cbc295de7934c4621abab1fb7645 https://gitlab.com/redhat/centos-stream/rpms/openmpi/-/commit/5dda5cc9dfc60f051dbabf9a9d1c28f26c1695d7 --- openmpi.spec | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 2ba8b9e..c574f67 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -32,12 +32,30 @@ %bcond_with java %endif +%if %{defined rhel} +%bcond_with orangefs +%else +%bcond_without orangefs +%endif + +%ifarch x86_64 +%if %{defined rhel} +%bcond_with psm +%else +%bcond_without psm +%endif +%bcond_without psm2 +%else +%bcond_with psm +%bcond_with psm2 +%endif + # Run autogen - needed for some patches %bcond_with autogen Name: openmpi%{?_cc_name_suffix} Version: 4.1.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -83,14 +101,18 @@ BuildRequires: libfabric-devel %ifnarch s390 s390x BuildRequires: papi-devel %endif +%if %{with orangefs} BuildRequires: orangefs-devel +%endif BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: pmix-devel BuildRequires: python%{python3_pkgversion}-devel -%ifarch x86_64 +%if %{with psm} BuildRequires: infinipath-psm-devel +%endif +%if %{with psm2} BuildRequires: libpsm2-devel %endif %if %{with ucx} @@ -380,6 +402,9 @@ make check %changelog +* Thu Jun 22 2023 Yaakov Selkowitz - 4.1.5-3 +- Disable PSM, OrangeFS in RHEL builds + * Tue Jun 13 2023 Python Maint - 4.1.5-2 - Rebuilt for Python 3.12