[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-336-g2de997d

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  2de997d9b3e94bad01d5f46d76f163d71e2bd7bd (commit)
      from  235c3f27724df2097a5f84d901618b8a6f32b282 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/2de997d9b3e94bad01d5f46d76f163d71e2bd7bd

commit 2de997d9b3e94bad01d5f46d76f163d71e2bd7bd
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Sat Jul 13 12:42:57 2013 -0500

    Get rid of PAC_CC_PREFIX.
    
    This environment is unused, since we never got it to work.  The
    original idea was to push the configuration for all compilers into a
    single file.  This never worked correctly, so it was disabled, but
    never deleted.  We don't fall back to the original config.rpath which
    defaults to an acl_cv_ prefix since that's very buggy.  The variables
    rely on not having that prefix.

diff --git a/confdb/aclocal_shl.m4 b/confdb/aclocal_shl.m4
index 35ff000..f974bfa 100644
--- a/confdb/aclocal_shl.m4
+++ b/confdb/aclocal_shl.m4
@@ -481,19 +481,11 @@ export LDFLAGS
 export LD
 export with_gnu_ld
 
-# FIXME these variables refer to each other and prefixing breaks that, so we
-# will disable the prefixing for now 
-## force all variables set in $2 to be prefixed with the compiler name instead of "acl_cv_"
-#PAC_CC_PREFIX=$1_
-PAC_CC_PREFIX=
-export PAC_CC_PREFIX
-
 AS_IF([$ac_aux_dir/config.rpath "$host" > $2],[:],[AC_MSG_ERROR([unable to execute $ac_aux_dir/config.rpath])])
 
 C_LINKPATH_SHL=""
 AC_SUBST([C_LINKPATH_SHL])
 
-AS_UNSET([PAC_CC_PREFIX])
 rm -f conftest.out
 
 # restore the old values
diff --git a/confdb/config.rpath b/confdb/config.rpath
index b1ea1f0..70f614e 100755
--- a/confdb/config.rpath
+++ b/confdb/config.rpath
@@ -1,24 +1,5 @@
 #! /bin/sh
 #
-################################################################################
-# MPICH custom modifications:
-#
-# This is the latest git version of config.rpath from gnulib as of 2011-06-16.
-# The only modifications can be found at the bottom of the script where all of
-# the output variables have been prefixed with "${PAC_CC_PREFIX}", which the
-# caller should set if prefixed variables are desired.  That is, if
-# "PAC_CC_PREFIX=FC_" then "FC_shlibext=..." will be in the output instead of
-# "acl_cv_shlibext=...".
-#
-# The provenance of this script is a bit unclear.  It appears to be code that
-# was excised from libtool 1.x and placed into GNU gettext.  The gettext project
-# was the "official" upstream source of this script for a while, but it appears
-# that gnulib is now where the most up-to-date version can be found.
-#
-# See PAC_COMPILER_SHLIB_FLAGS in confdb/aclocal_shl.m4 for MPICH's use of this
-# script.  [goodell@ 2011-06-16]
-################################################################################
-#
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
@@ -675,14 +656,10 @@ escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_sub
 escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-# if the caller did not pass a prefix, then use a default that is compatible
-# with the unmodified upstream version of this script
-: ${PAC_CC_PREFIX=acl_cv_}
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/'"$PAC_CC_PREFIX"'\1=/' <<EOF
-
-# MPICH ADDITION
-# Shared library suffix, including any period (normally "so").
-shrext="$shrext"
+# MPICH modification: we don't prefix with acl_cv_ by default.  This
+# is causing problems in the stock version of config.rpath as well.
+# LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"

-----------------------------------------------------------------------

Summary of changes:
 confdb/aclocal_shl.m4 |    8 --------
 confdb/config.rpath   |   31 ++++---------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
MPICH primary repository