Blame slurm_pmix_soname.patch

Philip Kovacs bff578
diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
Philip Kovacs 1c41f4
index 69c5191112..1d0080dd77 100644
Philip Kovacs bff578
--- a/src/plugins/mpi/pmix/mpi_pmix.c
Philip Kovacs bff578
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
Philip Kovacs 1c41f4
@@ -87,6 +87,8 @@ const char plugin_type[] = "mpi/pmix_v1";
Philip Kovacs 1c41f4
 const char plugin_type[] = "mpi/pmix_v2";
Philip Kovacs 1c41f4
 #elif (HAVE_PMIX_VER == 3)
Philip Kovacs 1c41f4
 const char plugin_type[] = "mpi/pmix_v3";
Philip Kovacs 1c41f4
+#elif (HAVE_PMIX_VER == 4)
Philip Kovacs 1c41f4
+const char plugin_type[] = "mpi/pmix_v4";
Philip Kovacs 1c41f4
 #endif
Philip Kovacs 1c41f4
 
Philip Kovacs 1c41f4
 const uint32_t plugin_version = SLURM_VERSION_NUMBER;
Philip Kovacs 1c41f4
@@ -112,8 +114,10 @@ static void *_libpmix_open(void)
Philip Kovacs 1c41f4
 	xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH);
Philip Kovacs b8027d
 #elif defined PMIXP_V3_LIBPATH
Philip Kovacs b8027d
 	xstrfmtcat(full_path, "%s/", PMIXP_V3_LIBPATH);
Philip Kovacs 1c41f4
+#elif defined PMIXP_V4_LIBPATH
Philip Kovacs 1c41f4
+	xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH);
Philip Kovacs b8027d
 #endif
Philip Kovacs b8027d
-	xstrfmtcat(full_path, "libpmix.so");
Philip Kovacs b8027d
+	xstrfmtcat(full_path, "libpmix.so.2");
Philip Kovacs 8a8ef7
 
Philip Kovacs c00dbe
 	lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
Philip Kovacs c00dbe
 	xfree(full_path);
Philip Kovacs 8a8ef7
diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
Philip Kovacs 1c41f4
index 44013246e3..96c40b5c3a 100644
Philip Kovacs 8a8ef7
--- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
Philip Kovacs 8a8ef7
+++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c
Philip Kovacs 1c41f4
@@ -169,7 +169,7 @@ static int _load_ucx_lib()
Philip Kovacs b8027d
 	 * we have from autoconf
Philip Kovacs b8027d
 	 */
Philip Kovacs b8027d
 	char *full_path = NULL;
Philip Kovacs b8027d
-	xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH);
Philip Kovacs b8027d
+	xstrfmtcat(full_path, "%s/libucp.so.0", PMIXP_UCX_LIBPATH);
Philip Kovacs c00dbe
 	_ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
Philip Kovacs c00dbe
 	xfree(full_path);
Philip Kovacs 8a8ef7
 	if (_ucx_lib_handler) {
Philip Kovacs 1c41f4
@@ -180,7 +180,7 @@ static int _load_ucx_lib()
Philip Kovacs b8027d
 	 * known by dynamic linker.
Philip Kovacs 8a8ef7
 	 */
Philip Kovacs 8a8ef7
 #endif
Philip Kovacs b8027d
-	_ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL);
Philip Kovacs b8027d
+	_ucx_lib_handler = dlopen("libucp.so.0", RTLD_LAZY | RTLD_GLOBAL);
Philip Kovacs 8a8ef7
 	if (!_ucx_lib_handler) {
Philip Kovacs 8a8ef7
 		char *err = dlerror();
Philip Kovacs 8a8ef7
 		PMIXP_ERROR("Cannot open UCX lib: %s", (err) ? err : "unknown");