[gentoo-commits] gentoo-x86 commit in sys-cluster/mpich2/files: mpich2-1.0.6-cxx.patch digest-mpich2-1.0.6 mpich2-1.0.6-fPIC.patch mpich2-1.0.6-shlib.patch mpich2-1.0.6-makefile.patch

[Steve Arnold (nerdboy)]

nerdboy     07/12/03 06:03:03

  Added:                mpich2-1.0.6-cxx.patch digest-mpich2-1.0.6
                        mpich2-1.0.6-fPIC.patch mpich2-1.0.6-shlib.patch
                        mpich2-1.0.6-makefile.patch
  Log:
  updated to latest upstream release with pvfs2 support and shared lib fixes
  (Portage version: 2.1.4_rc1)

Revision  Changes    Path
1.1                  sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-cxx.patch?rev=1.1&content-type=text/plain

Index: mpich2-1.0.6-cxx.patch
===================================================================
--- configure.orig	2007-10-14 13:47:58.000000000 -0700
+++ configure	2007-10-14 13:50:27.000000000 -0700
@@ -655,6 +655,7 @@
 NUMVERSION
 VERSION
 ABIVERSION
+CXXLIBPATH
 CONFIGURE_ARGUMENTS
 MPIFLIBNAME
 PMPIFLIBNAME
@@ -2199,6 +2200,10 @@
 # libtool manual)
 ABIVERSION="1:1"
 
+# This is needed for the C++ wrapper lib build (so we don't have unresolved
+# symbols).  The value is replaced via sed in the ebuild.
+export CXXLIBPATH="nerdboy"
+
 CONFIGURE_ARGUMENTS="$ac_configure_args"
 
 if test -n "$ac_configure_args" ; then
--- Makefile.in.orig	2007-10-14 14:51:03.000000000 -0700
+++ Makefile.in	2007-10-14 15:27:04.000000000 -0700
@@ -27,6 +27,7 @@
 MAKE            = @MAKE@
 MPILIBNAME      = @MPILIBNAME@
 PMPILIBNAME     = @PMPILIBNAME@
+CXXLIBPATH	= @CXXLIBPATH@
 
 
 VPATH = .:@srcdir@



1.1                  sys-cluster/mpich2/files/digest-mpich2-1.0.6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/digest-mpich2-1.0.6?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/digest-mpich2-1.0.6?rev=1.1&content-type=text/plain

Index: digest-mpich2-1.0.6
===================================================================
MD5 6373b7824a782e890ecf4bfb77cbc4cc mpich2-1.0.6p1.tar.gz 15437620
RMD160 c3249bec1936bd9f3de9a8bb83f29bd32b06c191 mpich2-1.0.6p1.tar.gz 15437620
SHA256 38808f96071965c79451a8d975fe4f28454f56f27a19ce13b2aec85012521fcc mpich2-1.0.6p1.tar.gz 15437620



1.1                  sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch?rev=1.1&content-type=text/plain

Index: mpich2-1.0.6-fPIC.patch
===================================================================
--- configure.orig	2007-10-10 20:59:53.000000000 -0700
+++ configure	2007-10-10 21:04:17.000000000 -0700
@@ -8783,24 +8783,24 @@
 	 # if the compiler allows it (e.g., building with gcc but
 	 # a different Fortran compiler. Another option is to
 	 # *require* g77.
-	 { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
-echo $ECHO_N "checking whether $F77 allows -shared -fpic... $ECHO_C" >&6; }
+	 { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
+echo $ECHO_N "checking whether $F77 allows -shared -fPIC... $ECHO_C" >&6; }
 	 rm -f conftest.f
 	 cat > conftest.f <<EOF
        program main
        end
 EOF
-         if $F77 -shared -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
-	     FC_SHL="$F77 -shared -fpic"
+         if $F77 -shared -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
+	     FC_SHL="$F77 -shared -fPIC"
              { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
          else
              { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-             { echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
-echo $ECHO_N "checking whether $F77 allows -fpic... $ECHO_C" >&6; }
-             if $F77 -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
-	         FC_SHL="$F77 -fpic"
+             { echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
+echo $ECHO_N "checking whether $F77 allows -fPIC... $ECHO_C" >&6; }
+             if $F77 -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
+	         FC_SHL="$F77 -fPIC"
                  { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
              else
@@ -9837,7 +9837,7 @@
     gcc)
     if test "$pac_cv_f90_vendor" = gnu -o "$F90" = "g95" ; then
         # If we have the GNU Fortran 95 compiler (untested)
-        F90_SHL="$F90 -shared -fpic"
+        F90_SHL="$F90 -shared -fPIC"
         F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
     else
         case "$pac_cv_f90_vendor" in
@@ -9848,13 +9848,13 @@
 
 	    intel)
 	    # Intel implements the GNU options
-	    F90_SHL="$F90 -shared -fpic"
+	    F90_SHL="$F90 -shared -fPIC"
             F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
 	    ;;
 
 	    pgi)
 	    # Portland Group implements the GNU options
-	    F90_SHL="$F90 -shared -fpic"
+	    F90_SHL="$F90 -shared -fPIC"
             F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
 	    ;;
 
@@ -10852,7 +10852,7 @@
 	;;
 	gcc)
         # Assume that the compiler is g++ if gcc style shared libraries chosen
-        CXX_SHL="$CXX -shared -fpic"
+        CXX_SHL="$CXX -shared -fPIC"
         CXX_LINKPATH_SHL="-Wl,-rpath -Wl,"
 	;;
 	cygwin|cygwin-gcc)
@@ -12571,7 +12571,7 @@
     # For example, include the libname as ${LIBNAME_SHL}
     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
     # May need -fPIC
-    CC_SHL='${CC} -fpic'
+    CC_SHL='${CC} -fPIC'
     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
     # More recent versions allow multiple args, separated by commas
     C_LINKPATH_SHL="-Wl,-rpath,"
@@ -12839,7 +12839,7 @@
     gcc)
     # For example, include the libname as ${LIBNAME_SHL}
     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-    pac_cc_sharedlibs='gcc -shared -fpic'
+    pac_cc_sharedlibs='gcc -shared -fPIC'
     pac_clink_sharedlibs='gcc -shared'
     ;;
     libtool)
--- confdb/aclocal_shl.m4.orig	2007-05-16 06:39:01.000000000 -0700
+++ confdb/aclocal_shl.m4	2007-10-10 21:05:15.000000000 -0700
@@ -89,7 +89,7 @@
     # For example, include the libname as ${LIBNAME_SHL}
     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
     # May need -fPIC 
-    CC_SHL='${CC} -fpic'
+    CC_SHL='${CC} -fPIC'
     #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
     # More recent versions allow multiple args, separated by commas
     C_LINKPATH_SHL="-Wl,-rpath,"
@@ -233,7 +233,7 @@
     gcc)
     # For example, include the libname as ${LIBNAME_SHL}
     #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
-    pac_cc_sharedlibs='gcc -shared -fpic'
+    pac_cc_sharedlibs='gcc -shared -fPIC'
     pac_clink_sharedlibs='gcc -shared'
     ;;
     libtool)



1.1                  sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-shlib.patch?rev=1.1&content-type=text/plain

Index: mpich2-1.0.6-shlib.patch
===================================================================
--- src/util/createshlib.in.orig	2007-09-12 07:39:20.000000000 -0700
+++ src/util/createshlib.in	2007-10-13 10:06:51.000000000 -0700
@@ -207,12 +207,12 @@
 
     *)
     # Typical Unix default
-    soName=$srclibbase.$SHLIB_EXT.$dottedVersion
+    soName=$srclibbase.$SHLIB_EXT.$majorVersion
     realName=$srclibbase.$SHLIB_EXT.$dottedVersion
     altNames="$srclibbase.$SHLIB_EXT"
-    if [ -n "$majorVersion" ] ; then
-	altNames="$altNames $srclibbase.$SHLIB_EXT.$majorVersion"
-    fi
+#    if [ -n "$majorVersion" ] ; then
+#	altNames="$altNames $srclibbase.$SHLIB_EXT.$majorVersion"
+#    fi
     ;;
 esac
 
@@ -293,15 +293,16 @@
         # Typically -Wl,-h,$soName
 	# FIXME: C_LINK_SHL knows the options for shared libraries,
 	# but not the args for setting the soname.
-	$Show ${C_LINK_SHL} -o $realName -Wl,-h,$soName .tmp/*.o 
-	# Do we need to add $dependentLibs ?
+	$Show ${C_LINK_SHL} -Wl,-soname,$soName -o $realName .tmp/*.o $dependentLibs
+	# Do we need to add $dependentLibs ? Yes!
 	;;
     esac
     if [ -n "$altNames" ] ; then
         for alt in $altNames ; do
 	    # Remove any alternate names before executing the ln step
 	    rm -f $alt
-            $Show ln -s $realName $alt
+	    $Show ln -s $realName $soName
+	    $Show ln -s $soName $alt
         done
     fi
 
@@ -345,7 +346,7 @@
     fi
     if [ -n "$altNames" ] ; then
         for alt in $altNames ; do
-            ( cd $destdir && $Show rm -f $alt && $Show ln -s $realName $alt )
+            ( cd $destdir && $Show rm -f $alt && $Show ln -s $soName $alt )
         done
     fi
 fi



1.1                  sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-makefile.patch?rev=1.1&content-type=text/plain

Index: mpich2-1.0.6-makefile.patch
===================================================================
--- Makefile.in.orig	2007-10-11 22:06:10.000000000 -0700
+++ Makefile.in	2007-10-11 22:18:48.000000000 -0700
@@ -125,17 +125,17 @@
 C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
 # Build the shared library from the shared object files
 lib/lib${MPILIBNAME}.@SHLIB_EXT@: lib/lib${MPILIBNAME}.la
-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}.la  -rpath $(libdir) )
+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}.la  -rpath $(libdir) -L${libdir} -laio )
 	if [ -n "@NO_WEAK_SYM@" -a \
 		"${MPILIBNAME}" != "${PMPILIBNAME}" ] ; then \
-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${PMPILIBNAME}.la  -rpath $(libdir) );\
+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${PMPILIBNAME}.la  -rpath $(libdir) -L${libdir} -laio );\
 	fi
 # Build the shared library from the shared object files
 lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la
-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME))
+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l${MPILIBNAME} )
 # Build the shared library from the shared object files
 lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
-	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) )
+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. -l${MPILIBNAME} -Lnerdboy -lstdc++ )
 
 # --------------------------------------------------------------------------
 .libstamp0: 



-- 
gentoo-commits@g.o mailing list