From c714e4c73e0466888b6faaf03295741fe695037d Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Thu, 27 Jul 2023 14:39:27 +0300 Subject: [PATCH] Require hwloc-ohpc for all OSes Require chkconfig for RHEL and openEuler Point to the PMIx installation path Signed-off-by: Martin Tzvetanov Grigorov --- components/rms/openpbs/SPECS/openpbs.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/rms/openpbs/SPECS/openpbs.spec b/components/rms/openpbs/SPECS/openpbs.spec index 4f4906ee79..1a27a1847c 100644 --- a/components/rms/openpbs/SPECS/openpbs.spec +++ b/components/rms/openpbs/SPECS/openpbs.spec @@ -73,7 +73,8 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: libtool-ltdl-devel -BuildRequires: hwloc-ohpc +BuildRequires: hwloc%{PROJ_DELIM} +BuildRequires: pmix%{PROJ_DELIM} BuildRequires: libX11-devel BuildRequires: libXt-devel BuildRequires: libedit-devel @@ -139,8 +140,8 @@ Requires: insserv-compat Requires: smtpdaemon Requires: hostname %endif -%if 0%{?rhel} >= 7 -Requires: hwloc-ohpc +Requires: hwloc%{PROJ_DELIM} +%if 0%{?rhel} >= 7 || 0%{?openEuler} Requires: chkconfig %endif Requires: libical @@ -282,6 +283,7 @@ cd build PBS_VERSION=%{pbs_version} \ --prefix=%{pbs_prefix} \ --with-hwloc=%{OHPC_LIBS}/hwloc \ + --with-pmix=%{OHPC_ADMIN}/pmix \ %if %{with ptl} --enable-ptl \ %endif