Merge pull request #2207 from rhc54/topic/pmixupdate

Update PMIx support to latest PMIx master

Author: rhc54

opal/mca/pmix/pmix3x/configure.m4

@@ -39,9 +39,9 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
 
     AC_ARG_ENABLE([pmix3-dstore],
                   [AC_HELP_STRING([--enable-pmix3-dstore],
-                                  [Enable PMIx shared memory data store (default: disabled)])])
+                                  [Enable PMIx shared memory data store (default: enabled)])])
     AC_MSG_CHECKING([if PMIx3 shared memory data store is enabled])
-    if test "$enable_pmix3_dstore" = "yes"; then
+    if test "$enable_pmix3_dstore" != "no"; then
         AC_MSG_RESULT([yes])
         opal_pmix_pmix3x_sm_flag=--enable-dstore
     else

opal/mca/pmix/pmix3x/pmix/NEWS

@@ -23,6 +23,16 @@ current release as well as the "stable" bug fix release branch.
 Master (not on release branches yet)
 ------------------------------------
 
+1.1.5
+-----
+- Add pmix_version.h to support direct detection of PMIx library version
+- Fix support for Solaris 10 by using abstract version of strnlen
+- Fix native security module for Solaris by using getpeerucred in
+  that environment
+- Ensure man pages don't get installed in embedded builds
+- Pass temporary directory locations in info keys instead of
+  the environment
+
 1.1.4
 -----
 - Properly increment the reference count for PMIx_Init

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git9cbb1bf
+repo_rev=git6ea0747
 
 # 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="Aug 19, 2016"
+date="Oct 11, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix3x/pmix/config/pmix.m4

@@ -17,7 +17,7 @@ dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
-dnl Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+dnl Copyright (c) 2013-2016 Intel, Inc. All rights reserved
 dnl Copyright (c) 2015-2016 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2016      Mellanox Technologies, Inc.
@@ -104,6 +104,12 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_DEFINE_UNQUOTED([PMIX_MINOR_VERSION], [$PMIX_MINOR_VERSION],
                        [The library minor version is always available, contrary to VERSION])
 
+    pmixmajor=${PMIX_MAJOR_VERSION}L
+    pmixminor=${PMIX_MINOR_VERSION}L
+    AC_SUBST(pmixmajor)
+    AC_SUBST(pmixminor)
+    AC_CONFIG_FILES(pmix_config_prefix[include/pmix_version.h])
+
     PMIX_RELEASE_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release`"
     if test "$?" != "0"; then
         AC_MSG_ERROR([Cannot continue])
@@ -136,6 +142,23 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     # replaced, not the entire file.
     AC_CONFIG_HEADERS(pmix_config_prefix[src/include/pmix_config.h])
 
+    # Rename symbols?
+    AC_ARG_WITH([pmix-symbol-rename],
+                AC_HELP_STRING([--with-pmix-symbol-rename=PREFIX],
+                               [Provide a prefix to rename PMIx symbols]))
+    AC_MSG_CHECKING([for symbol rename])
+    AS_IF([test ! -z "$with_pmix_symbol_rename" && test "$with_pmix_symbol_rename" != "yes"],
+          [AC_MSG_RESULT([$with_pmix_symbol_rename])
+           pmix_symbol_rename="$with_pmix_symbol_rename"
+           PMIX_RENAME=$with_pmix_symbol_rename],
+          [AC_MSG_RESULT([no])
+           pmix_symbol_rename=""
+           PMIX_RENAME=])
+    AC_DEFINE_UNQUOTED(PMIX_SYMBOL_RENAME, [$pmix_symbol_rename],
+                       [The pmix symbol rename include directive])
+    AC_SUBST(PMIX_RENAME)
+    AC_CONFIG_FILES(pmix_config_prefix[include/pmix_rename.h])
+
     # GCC specifics.
     if test "x$GCC" = "xyes"; then
         PMIX_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
@@ -592,20 +615,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     PMIX_HWLOC_CONFIG
 
-    ##################################
-    # SASL
-    ##################################
-    pmix_show_title "SASL"
-
-    PMIX_SASL_CONFIG
-
-    ##################################
-    # Munge
-    ##################################
-    pmix_show_title "Munge"
-
-    PMIX_MUNGE_CONFIG
-
     ##################################
     # MCA
     ##################################
@@ -698,16 +707,6 @@ AC_DEFUN([PMIX_DEFINE_ARGS],[
           [pmix_mode=standalone
            AC_MSG_RESULT([no])])
 
-    # Rename symbols?
-    AC_ARG_WITH([pmix-symbol-rename],
-                AC_HELP_STRING([--with-pmix-symbol-rename=FILE],
-                               [Provide an include file that contains directives to rename PMIx symbols]))
-    AS_IF([test ! -z "$with_pmix_symbol_rename" && test "$with_pmix_symbol_rename" != "yes"],
-          [pmix_symbol_rename="$with_pmix_symbol_rename"],
-          [pmix_symbol_rename=\"src/include/rename.h\"])
-    AC_DEFINE_UNQUOTED(PMIX_SYMBOL_RENAME, [$pmix_symbol_rename],
-                       [The pmix symbol rename include directive])
-
     # Install tests and examples?
     AC_MSG_CHECKING([if tests and examples are to be installed])
     AC_ARG_WITH([tests-examples],
@@ -840,16 +839,17 @@ AC_MSG_CHECKING([if want shared memory datastore])
 AC_ARG_ENABLE([dstore],
               [AC_HELP_STRING([--disable-dstore],
                               [Using shared memory datastore (default: enabled)])])
-if test "$enable_dstore" != "no" ; then
-    AC_MSG_RESULT([yes])
-    WANT_DSTORE=1
-else
+if test "$enable_dstore" == "no" ; then
     AC_MSG_RESULT([no])
     WANT_DSTORE=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_DSTORE=1
 fi
 AC_DEFINE_UNQUOTED([PMIX_ENABLE_DSTORE],
-                   [$WANT_DSTORE],
-                   [if want shared memory dstore feature])
+                 [$WANT_DSTORE],
+                 [if want shared memory dstore feature])
+
 #
 
 # Ident string

opal/mca/pmix/pmix3x/pmix/config/pmix_check_munge.m4

@@ -124,7 +124,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
     # Set output variables
     PMIX_EVENT_HEADER="<event.h>"
     PMIX_EVENT2_THREAD_HEADER="<event2/thread.h>"
-    PMIX_EVENT_LIB=-levent
+    PMIX_EVENT_LIB="-levent -levent_pthreads"
     AS_IF([test "$pmix_event_dir" != ""],
         [PMIX_EVENT_CPPFLAGS="-I$pmix_event_dir/include"])
     AS_IF([test "$pmix_event_libdir" != ""],

opal/mca/pmix/pmix3x/pmix/config/pmix_check_sasl.m4

@@ -19,4 +19,8 @@ include_HEADERS = \
         pmi2.h \
         pmix_tool.h
 
+nodist_include_HEADERS = \
+    pmix_version.h \
+    pmix_rename.h
+
 endif ! PMIX_EMBEDDED_MODE

opal/mca/pmix/pmix3x/pmix/config/pmix_setup_libevent.m4

@@ -48,7 +48,7 @@
 
 /* Structure and constant definitions */
 #include <pmix_common.h>
-
+#include <pmix_rename.h>
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {