Fix external PMIx v4.x check

Bug-Origin: https://github.com/open-mpi/ompi/pull/8337
Last-Updated: 2021-01-09
Forwarded: not-needed

Gbp-Pq: Name external-pmix-fix.patch

diff --git a/config/opal_check_pmi.m4 b/config/opal_check_pmi.m4
index 19f6f8a45951dfdd74f6fd5ff6229f453cc54852..e980c821df8d48f08b080138f89592dcf29a13b2 100644 (file)
--- a/config/opal_check_pmi.m4
+++ b/config/opal_check_pmi.m4
@@ -328,6 +328,7 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
                                                     ], [])],
                                     [AC_MSG_RESULT([found])
                                      opal_external_pmix_version=4x
+                                    opal_external_pmix_version_major=4
                                      opal_external_pmix_version_found=1
                                      opal_external_pmix_happy=yes],
                                     [AC_MSG_RESULT([not found])])])
@@ -342,6 +343,7 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
                                               ], [])],
                                    [AC_MSG_RESULT([found])
                                     opal_external_pmix_version=3x
+                                   opal_external_pmix_version_major=3
                                     opal_external_pmix_version_found=1
                                     opal_external_pmix_happy=yes],
                                    [AC_MSG_RESULT([not found])])])
@@ -356,6 +358,7 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
                                               ], [])],
                                    [AC_MSG_RESULT([found])
                                     opal_external_pmix_version=2x
+                                   opal_external_pmix_version_major=2
                                     opal_external_pmix_version_found=1
                                     opal_external_pmix_happy=yes],
                                    [AC_MSG_RESULT([not found])])])
@@ -370,6 +373,7 @@ AC_DEFUN([OPAL_CHECK_PMIX_LIB],[
                                               ], [])],
                                    [AC_MSG_RESULT([found])
                                     opal_external_pmix_version=1x
+                                   opal_external_pmix_version_major=1
                                     opal_external_pmix_version_found=1
                                     opal_external_have_pmix1=1
                                     opal_external_pmix_happy=yes],

diff --git a/opal/mca/pmix/ext3x/configure.m4 b/opal/mca/pmix/ext3x/configure.m4
index acfda71112159f630659d41f6070b99449ade198..8e3b1ed37fbe2716822fd79cd8d9ada1bc6bcd7c 100644 (file)
--- a/opal/mca/pmix/ext3x/configure.m4
+++ b/opal/mca/pmix/ext3x/configure.m4
@@ -32,18 +32,20 @@ AC_DEFUN([MCA_opal_pmix_ext3x_CONFIG],[
 
     AS_IF([test "$opal_external_pmix_happy" = "yes"],
           [ # check for the 3.x version
-           AC_MSG_CHECKING([if external component is version 3.x])
-           AS_IF([test "$opal_external_pmix_version" = "3x"],
-                 [AC_MSG_RESULT([yes])
-                  AS_IF([test "$opal_event_external_support" != "yes"],
-                        [AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
-                         AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
-                         AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
-                         AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
-                  opal_pmix_external_3x_happy=yes],
-                 [AC_MSG_RESULT([no])
-                  opal_pmix_external_3x_happy=no])
 
+             AC_MSG_CHECKING([if external component is version 3.x or higher])
+              if test $opal_external_pmix_version_major -ge 3 ; then
+                 AC_MSG_RESULT([yes])
+                 AS_IF([test "$opal_event_external_support" != "yes"],
+                       [AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])
+                        AC_MSG_WARN([LIBRARY. THIS LIBRARY MUST POINT TO THE SAME ONE USED])
+                        AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
+                        AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
+                 opal_pmix_external_3x_happy=yes
+           else
+               AC_MSG_RESULT([no])
+               opal_pmix_external_3x_happy=no
+           fi
            AS_IF([test "$opal_pmix_external_3x_happy" = "yes"],
                  [$1
                   # need to set the wrapper flags for static builds

diff --git a/opal/mca/pmix/pmix3x/pmix3x.h b/opal/mca/pmix/pmix3x/pmix3x.h
index 3579ed03a3c2a4b2589f5898ab47f4f6d8db63d1..a5102d152a93d30ed52c11b27cdb892a54c16c55 100644 (file)
--- a/opal/mca/pmix/pmix3x/pmix3x.h
+++ b/opal/mca/pmix/pmix3x/pmix3x.h
@@ -34,6 +34,7 @@
 #include "opal/mca/pmix/base/base.h"
 #include "pmix_server.h"
 #include "pmix_common.h"
+#include "pmix.h"
 
 BEGIN_C_DECLS