Sync to PMIx master (now v3.0)

Fix an apparent typo in external libevent configury Require external libevent for install of separate libpmix Signed-off-by: Ralph Castain <rhc@open-mpi.org>
2017-10-26 21:05:17 -07:00 · 2017-10-26 21:05:17 -07:00 · ea3508b26b
--- a/opal/mca/event/external/configure.m4
+++ b/opal/mca/event/external/configure.m4
@ -5,6 +5,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
+# Copyright (c) 2017      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -95,8 +96,9 @@ AC_DEFUN([MCA_opal_event_external_CONFIG],[
           AS_IF([test "$with_libevent" != "external" && test "$with_libevent" != "yes"],
                 [opal_event_dir=$with_libevent
                  AC_MSG_RESULT([$opal_event_dir])
-                  OPAL_CHECK_WITHDIR([libevent], [$with_libdir],
+                  OPAL_CHECK_WITHDIR([libevent], [$opal_event_dir],
                                     [include/event.h])
+                  opal_event_libdir=$with_libevent/lib
                 ],
                 [AC_MSG_RESULT([(default search paths)])])
           AS_IF([test ! -z "$with_libevent_libdir" && test "$with_libevent_libdir" != "yes"],
--- a/opal/mca/pmix/pmix3x/configure.m4
+++ b/opal/mca/pmix/pmix3x/configure.m4
@ -53,13 +53,19 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
        opal_pmix_pmix3x_timing_flag=--disable-pmix-timing
    fi

-    opal_pmix_pmix3x_args="$opal_pmix_pmix3x_timing_flag --without-tests-examples --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\""
+    opal_pmix_pmix3x_args="$opal_pmix_pmix3x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\""
    AS_IF([test "$enable_debug" = "yes"],
          [opal_pmix_pmix3x_args="--enable-debug $opal_pmix_pmix3x_args"
           CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
          [opal_pmix_pmix3x_args="--disable-debug $opal_pmix_pmix3x_args"
           CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
-    AS_IF([test "$enable_install_libpmix" != "yes"],
+    AS_IF([test "$enable_install_libpmix" == "yes"],
+          [AS_IF([test "$opal_event_external_want" != "yes"],
+                 [AC_MSG_WARN([Installing the embedded PMIx library as a separate])
+                  AC_MSG_WARN([standalone library requires that OMPI be configured])
+                  AC_MSG_WARN([against an external version of libevent.])
+                  AC_MSG_ERROR([Cannot continue])])
+           opal_pmix_pmix3x_args="--with-pmix-extra-lib=\"$opal_event_libdir/libevent.la $opal_event_libdir/libevent_pthreads.la\" $opal_pmix_pmix3x_args"],
          [opal_pmix_pmix3x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX2X_ --enable-embedded-mode $opal_pmix_pmix3x_args"])
    AS_IF([test "$with_devel_headers" = "yes"],
          [opal_pmix_pmix3x_args="--with-devel-headers  $opal_pmix_pmix3x_args"])
--- a/opal/mca/pmix/pmix3x/pmix/VERSION
+++ b/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=git4721af4
+repo_rev=gitffa464b

 # 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="Oct 25, 2017"
+date="Oct 26, 2017"

 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
--- a/opal/mca/pmix/pmix3x/pmix/config/pmix.m4
+++ b/opal/mca/pmix/pmix3x/pmix/config/pmix.m4
@ -1100,7 +1100,19 @@ AM_CONDITIONAL([WANT_INSTALL_HEADERS], [test $WANT_INSTALL_HEADERS -eq 1])
 #
 # Do we want to install binaries?
 #
-AM_CONDITIONAL([PMIX_INSTALL_BINARIES], [test "$pmix_mode" != "embedded"])
+AC_MSG_CHECKING([if want to disable binaries])
+AC_ARG_ENABLE(pmix-binaries,
+              AC_HELP_STRING([--enable-pmix-binaries],
+                             [enable PMIx tools]))
+if test "$enable_pmix_binaries" = "no"; then
+    AC_MSG_RESULT([no])
+    WANT_PMIX_BINARIES=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_PMIX_BINARIES=1
+fi
+
+AM_CONDITIONAL([PMIX_INSTALL_BINARIES], [test $WANT_PMIX_BINARIES -eq 1])


 ])dnl
--- a/opal/mca/pmix/pmix3x/pmix/contrib/pmix-valgrind.supp
+++ b/opal/mca/pmix/pmix3x/pmix/contrib/pmix-valgrind.supp
@ -1,6 +1,6 @@
 # -*- text -*-
 #
-# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
--- a/opal/mca/pmix/pmix3x/pmix/test/cli_stages.c
+++ b/opal/mca/pmix/pmix3x/pmix/test/cli_stages.c
@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
 * Copyright (c) 2015      Research Organization for Information Science
 *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$
--- a/opal/mca/pmix/pmix3x/pmix/test/cli_stages.h
+++ b/opal/mca/pmix/pmix3x/pmix/test/cli_stages.h
@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
 * Copyright (c) 2015      Research Organization for Information Science
 *                         and Technology (RIST). All rights reserved.
 * $COPYRIGHT$