diff --git a/opal/mca/pmix/pmix3x/pmix/NEWS b/opal/mca/pmix/pmix3x/pmix/NEWS index dd478a9a87..6445b18275 100644 --- a/opal/mca/pmix/pmix3x/pmix/NEWS +++ b/opal/mca/pmix/pmix3x/pmix/NEWS @@ -21,7 +21,7 @@ example, a bug might be fixed in the master, and then moved to multiple release branches. -3.1.3 -- TBD +3.1.3 -- 2 July 2019 ---------------------- - PR #1096: Restore PMIX_NUM_SLOTS for backward compatibility - PR #1106: Automatically generate PMIX_NUMERIC_VERSION @@ -64,6 +64,7 @@ multiple release branches. - PR #1311: Work around memory bug in older gcc compilers - PR #1321: Provide memory op hooks in user-facing macros - PR #1329: Add -fPIC to static builds +- PR #1340: Do not use '==' in m4 test statements 3.1.2 -- 24 Jan 2019 diff --git a/opal/mca/pmix/pmix3x/pmix/VERSION b/opal/mca/pmix/pmix3x/pmix/VERSION index 98c143b267..13511b92a5 100644 --- a/opal/mca/pmix/pmix3x/pmix/VERSION +++ b/opal/mca/pmix/pmix3x/pmix/VERSION @@ -23,14 +23,14 @@ release=3 # The only requirement is that it must be entirely printable ASCII # characters and have no white space. -greek=rc4 +greek= # If repo_rev is empty, then the repository version number will be # obtained during "make dist" via the "git describe --tags --always" # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=git5e6ec324 +repo_rev=gitc10fd1d4 # 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="Jun 25, 2019" +date="Jul 02, 2019" # The shared library version of each of PMIx's public libraries. # These versions are maintained in accordance with the "Library diff --git a/opal/mca/pmix/pmix3x/pmix/config/pmix.m4 b/opal/mca/pmix/pmix3x/pmix/config/pmix.m4 index a90e23b979..e0585256c4 100644 --- a/opal/mca/pmix/pmix3x/pmix/config/pmix.m4 +++ b/opal/mca/pmix/pmix3x/pmix/config/pmix.m4 @@ -191,7 +191,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[ [Link the output PMIx library to this extra lib (used in embedded mode)])) AC_MSG_CHECKING([for extra lib]) AS_IF([test ! -z "$with_pmix_extra_lib"], - [AS_IF([test "$with_pmix_extra_lib" == "yes" || test "$with_pmix_extra_lib" == "no"], + [AS_IF([test "$with_pmix_extra_lib" = "yes" || test "$with_pmix_extra_lib" = "no"], [AC_MSG_RESULT([ERROR]) AC_MSG_WARN([Invalid value for --with-extra-pmix-lib:]) AC_MSG_WARN([ $with_pmix_extra_lib]) @@ -209,7 +209,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[ [Link any embedded components/tools that require it to the provided libtool lib (used in embedded mode)])) AC_MSG_CHECKING([for extra ltlib]) AS_IF([test ! -z "$with_pmix_extra_ltlib"], - [AS_IF([test "$with_pmix_extra_ltlib" == "yes" || test "$with_pmix_extra_ltlib" == "no"], + [AS_IF([test "$with_pmix_extra_ltlib" = "yes" || test "$with_pmix_extra_ltlib" = "no"], [AC_MSG_RESULT([ERROR]) AC_MSG_WARN([Invalid value for --with-pmix-extra-ltlib:]) AC_MSG_WARN([ $with_pmix_extra_ltlib]) @@ -1184,7 +1184,7 @@ AC_MSG_CHECKING([if want to support dlopen of non-global namespaces]) AC_ARG_ENABLE([nonglobal-dlopen], AC_HELP_STRING([--enable-nonglobal-dlopen], [enable non-global dlopen (default: enabled)])) -if test "$enable_nonglobal_dlopen" == "no"; then +if test "$enable_nonglobal_dlopen" = "no"; then AC_MSG_RESULT([no]) pmix_need_libpmix=0 else diff --git a/opal/mca/pmix/pmix3x/pmix/configure.ac b/opal/mca/pmix/pmix3x/pmix/configure.ac index 53c0d64441..3cbd07e891 100644 --- a/opal/mca/pmix/pmix3x/pmix/configure.ac +++ b/opal/mca/pmix/pmix3x/pmix/configure.ac @@ -44,7 +44,7 @@ m4_include([config/autogen_found_items.m4]) AC_INIT([pmix], [m4_normalize(esyscmd([config/pmix_get_version.sh VERSION --tarball]))], - [https://github.com/pmix/pmix/issues], [pmix]) + [http://pmix.github.io/master], [pmix]) AC_PREREQ(2.69) AC_CONFIG_AUX_DIR(./config) # Note that this directory must *exactly* match what was specified via @@ -171,7 +171,7 @@ LT_PREREQ([2.2.6]) pmix_enable_shared="$enable_shared" pmix_enable_static="$enable_static" -AS_IF([test ! -z "$enable_static" && test "$enable_static" == "yes"], +AS_IF([test ! -z "$enable_static" && test "$enable_static" = "yes"], [CFLAGS="$CFLAGS -fPIC"]) AM_ENABLE_SHARED @@ -232,7 +232,6 @@ AS_IF([test ! -z "$PMIX_CFLAGS_cache"], [CFLAGS="$CFLAGS $PMIX_CFLAGS_cache"]) #fi # Cleanup duplicate flags -PMIX_FLAGS_UNIQ(CFLAGS) PMIX_FLAGS_UNIQ(CPPFLAGS) PMIX_FLAGS_UNIQ(LDFLAGS) PMIX_FLAGS_UNIQ(LIBS) @@ -259,17 +258,6 @@ AC_MSG_RESULT([$LDFLAGS]) AC_MSG_CHECKING([final LIBS]) AC_MSG_RESULT([$LIBS]) -#################################################################### -# -Werror for CI scripts -#################################################################### - -AC_ARG_ENABLE(werror, - AC_HELP_STRING([--enable-werror], - [Treat compiler warnings as errors]), -[ - CFLAGS="$CFLAGS -Werror" -]) - #################################################################### # Version information #################################################################### diff --git a/opal/mca/pmix/pmix3x/pmix/contrib/pmix.spec b/opal/mca/pmix/pmix3x/pmix/contrib/pmix.spec index 44b3810a92..6a47f05480 100644 --- a/opal/mca/pmix/pmix3x/pmix/contrib/pmix.spec +++ b/opal/mca/pmix/pmix3x/pmix/contrib/pmix.spec @@ -192,7 +192,7 @@ Summary: An extended/exascale implementation of PMI Name: %{?_name:%{_name}}%{!?_name:pmix} -Version: 3.1.3rc4 +Version: 3.1.3 Release: 1%{?dist} License: BSD Group: Development/Libraries diff --git a/opal/mca/pmix/pmix3x/pmix/contrib/whitespace-purge.sh b/opal/mca/pmix/pmix3x/pmix/contrib/whitespace-purge.sh index 9c9d8fe909..905796bc1e 100755 --- a/opal/mca/pmix/pmix3x/pmix/contrib/whitespace-purge.sh +++ b/opal/mca/pmix/pmix3x/pmix/contrib/whitespace-purge.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2015 Intel, Inc. All rights reserved. +# Copyright (c) 2015-2019 Intel, Inc. All rights reserved. # Copyright (c) 2015 Los Alamos National Security, LLC. All rights # reserved # Copyright (c) 2015 Cisco Systems, Inc. @@ -18,7 +18,7 @@ for file in $(git ls-files) ; do # skip sym links, pdfs, etc. If any other file types should be # skipped add the check here. type=$(file -b --mime-type -h $file) - if test ${type::4} == "text" ; then + if test ${type::4} = "text" ; then # Eliminate whitespace at the end of lines perl -pi -e 's/\s*$/\n/' $file fi diff --git a/opal/mca/pmix/pmix3x/pmix/src/mca/pnet/opa/configure.m4 b/opal/mca/pmix/pmix3x/pmix/src/mca/pnet/opa/configure.m4 index d822ffaf74..f613cba102 100644 --- a/opal/mca/pmix/pmix3x/pmix/src/mca/pnet/opa/configure.m4 +++ b/opal/mca/pmix/pmix3x/pmix/src/mca/pnet/opa/configure.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2014-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -46,7 +46,7 @@ AC_DEFUN([MCA_pmix_pnet_opa_CONFIG],[ pmix_check_opamgt_dir= AC_MSG_CHECKING([if opamgt requested]) - AS_IF([test "$with_opamgt" == "no"], + AS_IF([test "$with_opamgt" = "no"], [AC_MSG_RESULT([no]) pmix_check_opamgt_happy=no], [AC_MSG_RESULT([yes])