Merge pull request #6580 from ggouaillardet/topic/pmix_refresh

pmix/pmix4x: refresh to the latest PMIx

opal/mca/pmix/pmix4x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=a1
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git20cc9c04
+repo_rev=git2531c0c3
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Mar 25, 2019"
+date="Apr 09, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix4x/pmix/bindings/python/Makefile.am

@@ -11,7 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2018      Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
@@ -21,7 +21,7 @@
 # $HEADER$
 #
 
-helpers = setup.py client.py server.py cpmix.pxd pmix.pyx
+helpers = setup.py client.py server.py pmix.pyx
 
 if WANT_PYTHON_BINDINGS
 

opal/mca/pmix/pmix4x/pmix/config/distscript.sh

@@ -11,8 +11,8 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2015      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2015-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2015      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2017      Intel, Inc. All rights reserved.
@@ -42,7 +42,7 @@ fi
 # Otherwise, use what configure told us, at the cost of allowing one
 # or two corner cases in (but otherwise VPATH builds won't work).
 repo_rev=$PMIX_REPO_REV
-if test -d .git ; then
+if test -e .git ; then
     repo_rev=$(config/pmix_get_version.sh VERSION --repo-rev)
 fi
 

opal/mca/pmix/pmix4x/pmix/config/pmix.m4

@@ -725,8 +725,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     CFLAGS="$CFLAGS $THREAD_CFLAGS"
     CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
-    CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS"
-    CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS"
     LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
     LIBS="$LIBS $THREAD_LIBS"
 
@@ -736,10 +734,10 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     AC_PROG_LN_S
 
+    # Check for some common system programs that we need
     AC_PROG_GREP
     AC_PROG_EGREP
 
-
     ##################################
     # Visibility
     ##################################
@@ -903,6 +901,10 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
                         [Whether build should attempt to use dlopen (or
                          similar) to dynamically load components.
                          (default: enabled)])])
+    AS_IF([test "$enable_dlopen" = "unknown"],
+          [AC_MSG_WARN([enable_dlopen variable has been overwritten by configure])
+           AC_MSG_WARN([This is an internal error that should be reported to PMIx developers])
+           AC_MSG_ERROR([Cannot continue])])
     AS_IF([test "$enable_dlopen" = "no"],
           [enable_mca_dso="no"
            enable_mca_static="yes"
@@ -930,8 +932,16 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
 # Is this a developer copy?
 #
 
-if test -d .git; then
+if test -e $PMIX_TOP_SRCDIR/.git; then
     PMIX_DEVEL=1
+    # check for Flex
+    AC_PROG_LEX
+    if test "x$LEX" != xflex; then
+        AC_MSG_WARN([PMIx requires Flex to build from non-tarball sources,])
+        AC_MSG_WARN([but Flex was not found. Please install Flex into])
+        AC_MSG_WARN([your path and try again])
+        AC_MSG_ERROR([Cannot continue])
+    fi
 else
     PMIX_DEVEL=0
 fi
@@ -982,7 +992,6 @@ fi
 #################### Early development override ####################
 if test "$WANT_DEBUG" = "0"; then
     CFLAGS="-DNDEBUG $CFLAGS"
-    CXXFLAGS="-DNDEBUG $CXXFLAGS"
 fi
 AC_DEFINE_UNQUOTED(PMIX_ENABLE_DEBUG, $WANT_DEBUG,
                    [Whether we want developer-level debugging code or not])