Skip to content

Commit 34bd96a

Browse files
committed
Comment out v4 support.
Bug 7263
1 parent 9425066 commit 34bd96a

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

auxdir/x_ac_pmix.m4

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,29 @@ AC_DEFUN([X_AC_PMIX],
148148
break
149149
fi
150150
151-
if [test "$_x_ac_pmix_version" = "4"]; then
152-
if [test "$_x_ac_pmix_v4_found" = "1" ]; then
153-
m4_define([err_pmix_v4],[error processing $x_ac_cv_pmix_libdir: PMIx v4.x])
154-
AC_MSG_ERROR(err_pmix_v4 err_pmix)
155-
fi
156-
_x_ac_pmix_v4_found="1"
157-
PMIX_V4_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
158-
if test "$ac_with_rpath" = "yes"; then
159-
PMIX_V4_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
160-
else
161-
PMIX_V4_CPPFLAGS=$PMIX_V4_CPPFLAGS" -DPMIXP_V4_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\""
162-
fi
163-
# We don't want to search the other lib after we found it in
164-
# one place or we might report a false duplicate if lib64 is a
165-
# symlink of lib.
166-
break
167-
fi
151+
# V4 does not compile with Slurm as of this comment. When and if
152+
# it does in the future just uncomment this block below and v4
153+
# will be allowed to compile. We are waiting on PMIx to make this
154+
# happen. If v4 is important to you please contact them instead of
155+
# opening a bug with SchedMD.
156+
157+
# if [test "$_x_ac_pmix_version" = "4"]; then
158+
# if [test "$_x_ac_pmix_v4_found" = "1" ]; then
159+
# m4_define([err_pmix_v4],[error processing $x_ac_cv_pmix_libdir: PMIx v4.x])
160+
# AC_MSG_ERROR(err_pmix_v4 err_pmix)
161+
# fi
162+
# _x_ac_pmix_v4_found="1"
163+
# PMIX_V4_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
164+
# if test "$ac_with_rpath" = "yes"; then
165+
# PMIX_V4_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
166+
# else
167+
# PMIX_V4_CPPFLAGS=$PMIX_V4_CPPFLAGS" -DPMIXP_V4_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\""
168+
# fi
169+
# # We don't want to search the other lib after we found it in
170+
# # one place or we might report a false duplicate if lib64 is a
171+
# # symlink of lib.
172+
# break
173+
# fi
168174
done
169175
done
170176
])

0 commit comments

Comments
 (0)