From: Alastair McKinstry <mckinstry@debian.org>
Date: Tue, 1 Jan 2019 13:25:39 +0000 (+0000)
Subject: pmix-modex
X-Git-Tag: archive/raspbian/3.1.3-9+rpi1^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=704d97f19a58af69e28d6f6194bfbbe613a850ee;p=openmpi.git

pmix-modex


Gbp-Pq: Name pmix-modex.patch
---

diff --git a/opal/mca/pmix/ext1x/pmix1x_server_south.c b/opal/mca/pmix/ext1x/pmix1x_server_south.c
index 6765373e..9163844a 100644
--- a/opal/mca/pmix/ext1x/pmix1x_server_south.c
+++ b/opal/mca/pmix/ext1x/pmix1x_server_south.c
@@ -41,6 +41,11 @@
 #include "pmix.h"
 #include "pmix_server.h"
 
+/* Deprecated. Rewrite code below */
+#ifndef PMIX_INFO_ARRAY
+#define PMIX_INFO_ARRAY 44
+#endif
+
 /****    S.O.U.T.H.B.O.U.N.D   I.N.T.E.R.F.A.C.E.S     ****/
 
 /* These are the interfaces used by the OMPI/ORTE/OPAL layer to call
diff --git a/opal/mca/pmix/pmix2x/pmix2x.c b/opal/mca/pmix/pmix2x/pmix2x.c
index a00a6e63..141e5df1 100644
--- a/opal/mca/pmix/pmix2x/pmix2x.c
+++ b/opal/mca/pmix/pmix2x/pmix2x.c
@@ -1001,10 +1001,6 @@ int pmix2x_value_unload(opal_value_t *kv,
         OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED);
         rc = OPAL_ERR_NOT_SUPPORTED;
         break;
-    case PMIX_MODEX:
-        OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED);
-        rc = OPAL_ERR_NOT_SUPPORTED;
-        break;
     case PMIX_PERSIST:
         kv->type = OPAL_PERSIST;
         kv->data.uint8 = pmix2x_convert_persist(v->data.persist);
@@ -1111,10 +1107,6 @@ int pmix2x_value_unload(opal_value_t *kv,
         OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED);
         rc = OPAL_ERR_NOT_SUPPORTED;
         break;
-    case PMIX_INFO_ARRAY:
-        OPAL_ERROR_LOG(OPAL_ERR_NOT_SUPPORTED);
-        rc = OPAL_ERR_NOT_SUPPORTED;
-        break;
 
     default:
         /* silence warnings */