Merge pull request #6780 from ggouaillardet/topic/pmix_refresh

pmix/pmix4x: refresh to the latest PMIx master

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=gitf67efc83
+repo_rev=git99971222
 
 # 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 24, 2019"
+date="Jun 27, 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/configure.ac

@@ -52,9 +52,18 @@ AC_CONFIG_AUX_DIR(./config)
 AC_CONFIG_MACRO_DIR(./config)
 
 # autotools expects to perform tests without interference
-# from user-provided CFLAGS, so preserve them here
-PMIX_CFLAGS_user=$CFLAGS
-CFLAGS=
+# from user-provided CFLAGS, particularly -Werror flags.
+# Search for them here and cache any we find
+PMIX_CFLAGS_cache=
+PMIX_CFLAGS_pass=
+for val in $CFLAGS; do
+    if echo "$val" | grep -q -e "-W"; then
+        PMIX_CFLAGS_cache="$PMIX_CFLAGS_cache $val";
+    else
+        PMIX_CFLAGS_pass="$PMIX_CFLAGS_pass $val";
+    fi
+done
+CFLAGS=$PMIX_CFLAGS_pass
 
 PMIX_CAPTURE_CONFIGURE_CLI([PMIX_CONFIGURE_CLI])
 
@@ -162,6 +171,9 @@ 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"],
+      [CFLAGS="$CFLAGS -fPIC"])
+
 AM_ENABLE_SHARED
 AM_DISABLE_STATIC
 
@@ -210,8 +222,8 @@ AS_IF([test -z "$CC_FOR_BUILD"],[
     AC_SUBST([CC_FOR_BUILD], [$CC])
 ])
 
-# restore any user-provided flags
-AS_IF([test ! -z "$PMIX_CFLAGS_user"], [CFLAGS="$CFLAGS $PMIX_CFLAGS_user"])
+# restore any user-provided Werror flags
+AS_IF([test ! -z "$PMIX_CFLAGS_cache"], [CFLAGS="$CFLAGS $PMIX_CFLAGS_cache"])
 
 # Delay setting pickyness until here so we
 # don't break configure code tests