SHA256
1
0
forked from pool/slurm

Accepting request 1072585 from home:mslacken:branches:network:cluster

- use libpmix.so.2 instead of libpmix.so to fix (bsc#1209260)
  this removes the need of pmix-pluginlib

OBS-URL: https://build.opensuse.org/request/show/1072585
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=245
This commit is contained in:
Christian Goll 2023-03-17 10:42:09 +00:00 committed by Git OBS Bridge
parent 521f372d87
commit 9883ad6d58
3 changed files with 34 additions and 1 deletions

26
right-pmix-path.patch Normal file
View File

@ -0,0 +1,26 @@
From 2e5a2f4fbb4b575694cffb14aa59cb02e5d24486 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Tue, 14 Mar 2023 16:58:41 +0100
Subject: [PATCH] right pmix path
Signed-off-by: Christian Goll <cgoll@suse.de>
---
src/plugins/mpi/pmix/mpi_pmix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
index dde4d22751..007b556265 100644
--- a/src/plugins/mpi/pmix/mpi_pmix.c
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
@@ -137,7 +137,7 @@ static void *_libpmix_open(void)
#elif defined PMIXP_V4_LIBPATH
xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH);
#endif
- xstrfmtcat(full_path, "libpmix.so");
+ xstrfmtcat(full_path, "libpmix.so.2");
lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
xfree(full_path);
--
2.40.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 16 15:48:15 UTC 2023 - Christian Goll <cgoll@suse.com>
- use libpmix.so.2 instead of libpmix.so to fix (bsc#1209260)
this removes the need of pmix-pluginlib
-------------------------------------------------------------------
Wed Mar 15 10:19:12 UTC 2023 - Christian Goll <cgoll@suse.com>

View File

@ -141,6 +141,7 @@ Source20: test_setup.tar.gz
Source21: README_Testsuite.md
Patch0: Remove-rpath-from-build.patch
Patch2: pam_slurm-Initialize-arrays-and-pass-sizes.patch
Patch3: right-pmix-path.patch
Patch10: Fix-test-21.41.patch
Patch11: Fix-test-38.11.patch
Patch12: Fix-test-32.8.patch
@ -399,7 +400,6 @@ Group: Productivity/Clustering/Computing
%if %{with pmix}
Requires: libpmix%{pmix_so}
Requires: pmix
Requires: pmix-pluginlib
%endif
%description plugins
@ -647,6 +647,7 @@ Do not run test suite and file bug reports for each failed test!
%setup -q -n %{pname}-%{dl_ver}
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1