From a3be09ab705543a4ef2aadfc65c1d09f1e9dad91 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Sun, 21 May 2006 18:54:51 +0000 Subject: Updated to new version (bug 125754) with patches (Portage version: 2.1_rc1-r3) --- sys-cluster/mpich2/ChangeLog | 13 ++- sys-cluster/mpich2/files/digest-mpich2-1.0.2_p1 | 2 + sys-cluster/mpich2/files/digest-mpich2-1.0.3 | 3 + sys-cluster/mpich2/files/mpich2-1.0.3-make.patch | 60 ++++++++++++++ sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch | 24 ++++++ sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild | 4 +- sys-cluster/mpich2/mpich2-1.0.3.ebuild | 92 ++++++++++++++++++++++ 7 files changed, 194 insertions(+), 4 deletions(-) create mode 100644 sys-cluster/mpich2/files/digest-mpich2-1.0.3 create mode 100644 sys-cluster/mpich2/files/mpich2-1.0.3-make.patch create mode 100644 sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch create mode 100644 sys-cluster/mpich2/mpich2-1.0.3.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog index c8f971366fd8..b232753a2233 100644 --- a/sys-cluster/mpich2/ChangeLog +++ b/sys-cluster/mpich2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-cluster/mpich2 -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.1 2006/01/11 14:51:09 kanaka Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.2 2006/05/21 18:54:51 nerdboy Exp $ + +*mpich2-1.0.3 (21 May 2006) + + 21 May 2006; Steve Arnold + +files/mpich2-1.0.3-make.patch, +files/mpich2-1.0.3-soname.patch, + +mpich2-1.0.3.ebuild: + Updated to new version (bug 125754) with patches; needed some help to + create shared libs properly, along with some DESTDIR fixes (required for + HDF5 dep, as virtual/mpi was barfing). *mpich2-1.0.2_p1 (27 Dec 2005) diff --git a/sys-cluster/mpich2/files/digest-mpich2-1.0.2_p1 b/sys-cluster/mpich2/files/digest-mpich2-1.0.2_p1 index 7e5a35b1d224..a308824752e5 100644 --- a/sys-cluster/mpich2/files/digest-mpich2-1.0.2_p1 +++ b/sys-cluster/mpich2/files/digest-mpich2-1.0.2_p1 @@ -1 +1,3 @@ MD5 04d38fce64900d5216da067de44fb780 mpich2-1.0.2p1.tar.gz 12172068 +RMD160 28f0623528c456812a5effc3d818b58bbd51cbf2 mpich2-1.0.2p1.tar.gz 12172068 +SHA256 4efefdda63526f766e06f234dd8349a32c4d706f63a6bb32f643e8d37595bc5c mpich2-1.0.2p1.tar.gz 12172068 diff --git a/sys-cluster/mpich2/files/digest-mpich2-1.0.3 b/sys-cluster/mpich2/files/digest-mpich2-1.0.3 new file mode 100644 index 000000000000..2739835281c8 --- /dev/null +++ b/sys-cluster/mpich2/files/digest-mpich2-1.0.3 @@ -0,0 +1,3 @@ +MD5 6fa6b0f5a290285a90c239127d1eaa58 mpich2-1.0.3.tar.gz 12166368 +RMD160 5e7cd42f8359d81e6578d1fffca4708471e03cec mpich2-1.0.3.tar.gz 12166368 +SHA256 294717fc05e9d509ed0e45c99709ddba696ad6919c47fc0801a410fe129623df mpich2-1.0.3.tar.gz 12166368 diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch new file mode 100644 index 000000000000..2e9d4a31c67e --- /dev/null +++ b/sys-cluster/mpich2/files/mpich2-1.0.3-make.patch @@ -0,0 +1,60 @@ +--- Makefile.in.orig 2006-05-20 21:49:41.000000000 -0700 ++++ Makefile.in 2006-05-20 22:12:04.000000000 -0700 +@@ -229,9 +229,12 @@ + if [ -s lib/lib${MPICXXLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPICXXLIBNAME}.a ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a ; fi + if [ -s lib/lib${PMPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${PMPILIBNAME}.a ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a ; fi + if [ -s lib/libf${MPILIBNAME}.a ] ; then $(INSTALL_DATA) lib/libf${MPILIBNAME}.a ${DESTDIR}${libdir}/libf${MPILIBNAME}.a ; fi +- if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@ ; fi +- if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@ ; fi +- if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi ++ if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi ++ if [ -s lib/lib${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${MPILIBNAME}.@SHLIB_EXT@.0.0 lib${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi ++ if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 ; fi ++ if [ -s lib/lib${PMPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf lib${PMPILIBNAME}.@SHLIB_EXT@.0.0 lib${PMPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi ++ if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@.0.0 ; fi ++ if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then cd ${DESTDIR}${libdir} ; ln -sf libf${MPILIBNAME}.@SHLIB_EXT@.0.0 libf${MPILIBNAME}.@SHLIB_EXT@ ; cd - ; fi + if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi + if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi + if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi +@@ -258,9 +261,9 @@ + -rm -f ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.a + -rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.a + -rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.a +- -rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@ +- -rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@ +- -rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ++ -rm -f ${DESTDIR}${libdir}/lib${MPILIBNAME}.@SHLIB_EXT@* ++ -rm -f ${DESTDIR}${libdir}/lib${PMPILIBNAME}.@SHLIB_EXT@* ++ -rm -f ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@* + -rm -f ${DESTDIR}${docdir}/user.pdf + -rm -f ${DESTDIR}${docdir}/install.pdf + -rm -f ${DESTDIR}${docdir}/smpd_pmi.pdf +--- Makefile.in.orig 2006-05-20 15:59:26.000000000 -0700 ++++ Makefile.in 2006-05-20 16:06:24.000000000 -0700 +@@ -428,11 +428,11 @@ + install-local: + -if [ "@BUILD_TVDLL@" = "yes" ] ; then \ + $(INSTALL_DATA) src/mpi/debugger/libtvmpich.@SHLIB_EXT@ \ +- ${libdir}/libtvmpich.@SHLIB_EXT@ ; fi +- if test ! -d ${exec_prefix}/examples ; then \ +- $(MKDIR_P) ${exec_prefix}/examples ; \ ++ ${DESTDIR}${libdir}/libtvmpich.@SHLIB_EXT@ ; fi ++ if test ! -d ${DESTDIR}${exec_prefix}/examples ; then \ ++ $(MKDIR_P) ${DESTDIR}${exec_prefix}/examples ; \ + fi +- $(INSTALL_PROGRAM) examples/cpi ${exec_prefix}/examples/cpi ++ $(INSTALL_PROGRAM) examples/cpi ${DESTDIR}${exec_prefix}/examples/cpi + + install-devdocs: + (cd doc && $(MAKE) install-devdocs) +--- src/pm/mpd/Makefile.in.orig 2005-10-24 12:08:40.000000000 -0700 ++++ src/pm/mpd/Makefile.in 2006-05-21 11:12:37.000000000 -0700 +@@ -119,7 +119,7 @@ + @echo "copying python files/links into " $(DESTDIR)${bindir} + -@for cmd in ${PYTHON_SOURCE} ; do \ + sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \ +- ${INSTALL} -m 755 ${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \ ++ ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \ + ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \ + done + -@cd $(DESTDIR)${bindir} && rm -f mpd diff --git a/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch b/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch new file mode 100644 index 000000000000..cd8f19e2f73f --- /dev/null +++ b/sys-cluster/mpich2/files/mpich2-1.0.3-soname.patch @@ -0,0 +1,24 @@ +--- configure.orig 2005-11-23 10:41:50.000000000 -0800 ++++ configure 2006-05-20 21:04:16.000000000 -0700 +@@ -9619,6 +9619,7 @@ + C_LINK_SHL=true + SHLIB_EXT=so + SHLIB_FROM_LO=no ++SHLIB_VER=0.0 + SHLIB_INSTALL='$(INSTALL_PROGRAM)' + case "$enable_sharedlibs" in + no|none) +@@ -9640,11 +9641,11 @@ + # Not quite right yet. See mpich/util/makesharedlib + # Use syntax that works in both Make and the shell + #C_LINK_SHL='${CC} -shared -Wl,-r' +- C_LINK_SHL='${CC} -shared' ++ C_LINK_SHL='${CC} -shared -Wl,-soname,lib$MPILIBNAME.$SHLIB_EXT.0.0' + # For example, include the libname as ${LIBNAME_SHL} + #C_LINK_SHL='${CC} -shared -Wl,-h,' + # May need -fPIC +- CC_SHL='${CC} -fpic' ++ CC_SHL='${CC} -fPIC' + C_LINKPATH_SHL="-Wl,-rpath -Wl," + # We need to test that this isn't osx. The following is a + # simple hack diff --git a/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild b/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild index 094766fd3738..1b470829c60a 100644 --- a/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild +++ b/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild,v 1.1 2006/01/11 14:51:09 kanaka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.2_p1.ebuild,v 1.2 2006/05/21 18:54:51 nerdboy Exp $ inherit eutils diff --git a/sys-cluster/mpich2/mpich2-1.0.3.ebuild b/sys-cluster/mpich2/mpich2-1.0.3.ebuild new file mode 100644 index 000000000000..80618b9f8314 --- /dev/null +++ b/sys-cluster/mpich2/mpich2-1.0.3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.3.ebuild,v 1.1 2006/05/21 18:54:51 nerdboy Exp $ + +inherit eutils autotools kde-functions + +DESCRIPTION="MPICH2 - A portable MPI implementation" +HOMEPAGE="http://www-unix.mcs.anl.gov/mpi/mpich2" +SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crypt cxx doc debug mpe" + +PROVIDE="virtual/mpi" +DEPEND="virtual/libc + sys-devel/autoconf + sys-devel/automake + sys-devel/libtool" +RDEPEND="${DEPEND} + crypt? ( net-misc/openssh ) + !crypt? ( net-misc/netkit-rsh ) + !virtual/mpi" + +pkg_setup() { + if [ -n "${MPICH_CONFIGURE_OPTS}" ]; then + einfo "Custom configure options are ${MPICH_CONFIGURE_OPTS}." + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + need-autoconf 2.5 + epatch ${FILESDIR}/${P}-soname.patch + ebegin "Reconfiguring" + ./maint/updatefiles + eend "Reconfigure failed" + epatch ${FILESDIR}/${P}-make.patch +} + +src_compile() { + export LDFLAGS='-Wl,-z,now' + local RSHCOMMAND + + if use crypt ; then + RSHCOMMAND="ssh -x" + else + RSHCOMMAND="rsh" + fi + export RSHCOMMAND + + local myconf="${MPICH_CONFIGURE_OPTS}" + + if ! use debug ; then + myconf="${myconf} --enable-fast --enable-g=none" + else + myconf="${myconf} --enable-g=dbg --enable-debuginfo" + fi + + ./configure --prefix=/usr --enable-sharedlibs=gcc \ + ${myconf} \ + $(use_enable cxx) \ + $(use_enable mpe) \ + --libdir=/usr/$(get_libdir) \ + --mandir=/usr/share/man \ + --with-docdir=/usr/share/doc/${PF} \ + --with-htmldir=/usr/share/doc/${PF}/html \ + --sysconfdir=/etc/mpich2 \ + --datadir=/usr/share/mpich2 || die "configure failed" + make || die "make failed" +} + +src_install() { + make install DESTDIR=${D} || die "make install failed" + + dodir /usr/share/${PN} + mv ${D}usr/examples/cpi ${D}usr/share/${PN}/cpi + rm -rf ${D}/usr/examples + + dodir /usr/share/doc/${PF} + if use doc; then + dodoc COPYRIGHT README README.romio README.testing CHANGES + dodoc README.developer RELEASE_NOTES + else + rm -rf ${D}/usr/share/doc/ + rm -rf ${D}/usr/share/man/ + dodoc README CHANGES COPYRIGHT RELEASE_NOTES + newdoc src/pm/mpd/README README.mpd + fi +} -- cgit v1.2.3-65-gdbad