made libaio and basic romio support the standard config

Package-Manager: portage-2.1.4_rc7

4 files changed, 99 insertions, 27 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 02ae9db5de64..05850bed861b 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.23 2007/12/12 05:20:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.24 2007/12/24 17:32:54 nerdboy Exp $
+
+  24 Dec 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/mpich2-1.0.6-no-pvfs2.patch, mpich2-1.0.6.ebuild:
+  Made libaio and basic romio support the standard config (removed romio USE
+  flag).  It still won't quite build the shared libs correctly if pvfs2 is
+  installed but not enabled for the mpich2 build.  The pvfs2 package must
+  be removed if building mpich2 without pvfs2 support, otherwise the shared
+  libraries will have a missing symbol from the detected PVFS2/AIO config.
+  The libaio and basic romio support are required for the standard build
+  (which is just unix filesystem and NFS client support) and pvfs2 support
+  is completely optional.  Everything now appears to build correctly as far 
+  as shared libs, both with and without pvfs2 support, the mpe and mpe-sdk 
+  stuff, etc.  Test away...
 
   12 Dec 2007; Steve Arnold <nerdboy@gentoo.org> mpich2-1.0.6.ebuild:
   fixed string quoting issue in bug 201182, although I can't reproduce
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index eaff01ba8b99..a4e6ddcb476c 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -38,6 +38,10 @@ AUX mpich2-1.0.6-makefile.patch 1758 RMD160 af1eafc2e65d7ef33206c945c94741892070
 MD5 0417ac525772398c94d665b959ec068e files/mpich2-1.0.6-makefile.patch 1758
 RMD160 af1eafc2e65d7ef33206c945c947418920704268 files/mpich2-1.0.6-makefile.patch 1758
 SHA256 4ab34c5dc07322dc71df29d27ae96c9e88f1af444f980547dc5d3a055fdd2577 files/mpich2-1.0.6-makefile.patch 1758
+AUX mpich2-1.0.6-no-pvfs2.patch 1014 RMD160 627224ce6f4093ef5624107d53211b4de9c43b62 SHA1 846e9fe09153e9a6e6cd87b13b021d176b16631a SHA256 d69529a23626af31143945557a71ad7690169b7db0b8446183b4d8703b220e76
+MD5 09f003f686f56f486e5064591e219968 files/mpich2-1.0.6-no-pvfs2.patch 1014
+RMD160 627224ce6f4093ef5624107d53211b4de9c43b62 files/mpich2-1.0.6-no-pvfs2.patch 1014
+SHA256 d69529a23626af31143945557a71ad7690169b7db0b8446183b4d8703b220e76 files/mpich2-1.0.6-no-pvfs2.patch 1014
 AUX mpich2-1.0.6-shlib.patch 1576 RMD160 b68da396b97cfce783e5439eb53388c96ee74bef SHA1 0f6f7f929d69ec70c5ec14a785c4388a032166b7 SHA256 32ed3e4fa4048b3efcea3db55326c89ccb50bf86d0928e6fc8b0b3e715702089
 MD5 1f63798fa81f9401d9ec97044490b65a files/mpich2-1.0.6-shlib.patch 1576
 RMD160 b68da396b97cfce783e5439eb53388c96ee74bef files/mpich2-1.0.6-shlib.patch 1576
@@ -57,14 +61,14 @@ EBUILD mpich2-1.0.5_p4.ebuild 6140 RMD160 6201f8e82c836dae1625eabedb9dded7df225d
 MD5 f5493661b52b16c7f5494db0d216253e mpich2-1.0.5_p4.ebuild 6140
 RMD160 6201f8e82c836dae1625eabedb9dded7df225dbd mpich2-1.0.5_p4.ebuild 6140
 SHA256 f8ad7e2459842c1784c74d593d2ba59e9843b710c80ba3ca71005be1130e0f30 mpich2-1.0.5_p4.ebuild 6140
-EBUILD mpich2-1.0.6.ebuild 10292 RMD160 ae8d901fe6cb066af273af8a08143d10fe3b51aa SHA1 ad60eea860ce9c39a945fce2112490a29864ea06 SHA256 c55d53f4a80536ee1fc7283daa22320a737d3c1750e2e5ac3f33c6c3ecd6fbee
-MD5 686bc9037f253636fb03704118be51c4 mpich2-1.0.6.ebuild 10292
-RMD160 ae8d901fe6cb066af273af8a08143d10fe3b51aa mpich2-1.0.6.ebuild 10292
-SHA256 c55d53f4a80536ee1fc7283daa22320a737d3c1750e2e5ac3f33c6c3ecd6fbee mpich2-1.0.6.ebuild 10292
-MISC ChangeLog 5507 RMD160 5c5aa70e930464f2cc040a512911a073e4620028 SHA1 8cf594426058144d97b13fc21b94dfe3349a3b8d SHA256 689ecf4c49addcc3aab9337789bc74f132fbc6e7b207e8d8f5d21978b95b791b
-MD5 60f97987c43e4fae048b84fdacf32370 ChangeLog 5507
-RMD160 5c5aa70e930464f2cc040a512911a073e4620028 ChangeLog 5507
-SHA256 689ecf4c49addcc3aab9337789bc74f132fbc6e7b207e8d8f5d21978b95b791b ChangeLog 5507
+EBUILD mpich2-1.0.6.ebuild 11152 RMD160 5ee614e8b4f83608f60d9337163e1cc5edb05ebb SHA1 0df4077197963bf14e7eb1c9404835c6814e01c2 SHA256 c7f04858fae1b4dab48068d882eff7e935a252ad8ed191e5d89bd3012b9ceb5f
+MD5 44a31cdbc29da69d179207668738e685 mpich2-1.0.6.ebuild 11152
+RMD160 5ee614e8b4f83608f60d9337163e1cc5edb05ebb mpich2-1.0.6.ebuild 11152
+SHA256 c7f04858fae1b4dab48068d882eff7e935a252ad8ed191e5d89bd3012b9ceb5f mpich2-1.0.6.ebuild 11152
+MISC ChangeLog 6322 RMD160 520ea0cab0b154285235242b27f9fb05efb65d16 SHA1 2062f4537049164df38661427fb305876fe98458 SHA256 6c94525dfa8bc7bd65e12691089318fab6c6579cd522aff01140d3052ff7205e
+MD5 199b0966095b93e9cfe6e99c4569d6fb ChangeLog 6322
+RMD160 520ea0cab0b154285235242b27f9fb05efb65d16 ChangeLog 6322
+SHA256 6c94525dfa8bc7bd65e12691089318fab6c6579cd522aff01140d3052ff7205e ChangeLog 6322
 MISC metadata.xml 252 RMD160 10123b1072a83227cac20dfe2a5065a3a6851563 SHA1 571c3db0391f894cb0bcbda2e3c5bd561482aca6 SHA256 cbf48aa7f9f6669327e88c9825ece05758d93afffa5c30b9b28568131b008367
 MD5 f3a1d3eb35133f846cfa104bad3643ad metadata.xml 252
 RMD160 10123b1072a83227cac20dfe2a5065a3a6851563 metadata.xml 252
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch b/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch
new file mode 100644
index 000000000000..c3b58e447956
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.0.6-no-pvfs2.patch
@@ -0,0 +1,37 @@
+--- src/mpi/romio/configure.orig	2007-12-15 17:34:03.000000000 -0800
++++ src/mpi/romio/configure	2007-12-15 18:15:12.000000000 -0800
+@@ -1925,6 +1925,12 @@
+ # Check whether --with-pvfs2 was given.
+ if test "${with_pvfs2+set}" = set; then
+   withval=$with_pvfs2;
++  if test "x$withval" = "xno" ; then
++    without_pvfs2=yes
++    with_pvfs2=""
++  fi
++else
++  without_pvfs2=yes
+ fi
+ 
+ 
+@@ -7574,11 +7580,16 @@
+ 
+ 
+ if test $PVFS2_CONFIG != "notfound" ; then
+-	CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
+-	LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
+-	ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
+-	FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
+-	file_system_pvfs2=1
++	if test "x$without_pvfs2" = "xyes" ; then
++		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
++		file_system_pvfs2=0
++	else
++		CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
++		LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
++		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
++		FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
++		file_system_pvfs2=1
++	fi
+ fi
+ 
+ if test "$PVFS2_CONFIG" = "notfound" -a -n "$with_pvfs2" ; then
diff --git a/sys-cluster/mpich2/mpich2-1.0.6.ebuild b/sys-cluster/mpich2/mpich2-1.0.6.ebuild
index 8aedb1e49135..b674c392abd3 100644
--- a/sys-cluster/mpich2/mpich2-1.0.6.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.3 2007/12/12 05:20:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.6.ebuild,v 1.4 2007/12/24 17:32:54 nerdboy Exp $
 
 inherit autotools distutils eutils flag-o-matic fortran java-pkg-2
 
@@ -16,17 +16,17 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/${MY_P}.tar.g
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="crypt cxx debug doc fast fortran mpe mpe-sdk pvfs2 romio threads"
+IUSE="crypt cxx debug doc fast fortran mpe mpe-sdk pvfs2 threads"
 
 DEPEND="virtual/libc
 	sys-devel/libtool
 	dev-lang/perl
 	>=dev-lang/python-2.3
+	>=dev-libs/libaio-0.3.106
+	net-fs/nfs-utils
+	pvfs2? ( >=sys-cluster/pvfs2-2.7.0 )
 	mpe-sdk? ( >=virtual/jdk-1.5
 		x11-proto/xproto )
-	romio? ( >=dev-libs/libaio-0.3.106
-		net-fs/nfs-utils )
-	pvfs2? ( >=sys-cluster/pvfs2-2.7.0 )
 	doc? ( virtual/tetex )"
 
 RDEPEND="${DEPEND}
@@ -99,8 +99,17 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-makefile.patch" || die "make patch failed"
 
 	if use pvfs2; then
-	    sed -i -e "s:-laio:-lpvfs2 -laio:g" Makefile.in \
+	    sed -i -e "s:-laio:-laio -lpvfs2:g" Makefile.in \
 		|| die "sed pvfs2 failed"
+	else
+	    epatch "${FILESDIR}/${P}-no-pvfs2.patch" || die "no pvfs patch failed"
+	    elog ""
+	    ewarn "If you wish to build without pvfs2 support, then you will"
+	    ewarn "need to remove the pvfs2 package if already installed."
+	    ewarn "Please remove pvfs2 and then rebuild mpich2.  If pvfs2"
+	    ewarn "is not installed, then you can safely ignore this warning."
+	    elog ""
+	    epause 5
 	fi
 
 	use mpe-sdk && setup-jvm-opts
@@ -149,16 +158,20 @@ src_compile() {
 		;;
 	esac
 
-	if use romio; then
-	    myconf="${myconf} --enable-aio"
-	    if use pvfs2; then
-		myconf="${myconf} --with-file-system=pvfs2+nfs+ufs \
-		    --with-pvfs2=/usr"
-	    else
-		myconf="${myconf} --with-file-system=nfs+ufs"
-	    fi
-	    use debug && myconf="${myconf} --enable-debug"
+	# top-level configure option is romio
+	myconf="${myconf} --enable-romio"
+
+	# several of these are romio-specific configure options
+	myconf="${myconf} --enable-aio --with-mpi=mpich2_mpi"
+	if use pvfs2; then
+	    myconf="${myconf} --with-file-system=pvfs2+nfs+ufs \
+		--with-pvfs2=/usr"
+	else
+	    # support for nfs and unix-like filesystems is the minimum
+	    myconf="${myconf} --with-file-system=nfs+ufs --with-pvfs2=no"
 	fi
+	# enable debug for romio
+	use debug && myconf="${myconf} --enable-debug"
 
 	use mpe && MPE_SRC_DIR="${S}"/src/mpe2
 
@@ -207,19 +220,19 @@ src_compile() {
 
 	"${S}"/configure \
 		--with-pm=mpd,gforker \
+		--prefix=/usr \
+		--exec-prefix=/usr \
 		${myconf} \
 		${mpe_conf} \
 		${doc_conf} \
 		$(use_enable fast) \
 		$(use_enable cxx) \
 		$(use_enable mpe) \
-		$(use_enable romio) \
 		$(use_enable threads) \
 		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/"${PN}" \
-		--prefix=/usr --exec-prefix=/usr \
 		--datadir=/usr/share/"${PN}" || die "configure failed"
 
 	# no parallel make here
@@ -319,7 +332,12 @@ pkg_postinst() {
 	elog "utilities.  You probably don't want to enable the mpe-sdk USE"
 	elog "flag on a server, cluster node, etc."
 	elog ""
-	elog "Note 2: this package still needs testing with other Fortran90"
+	elog "Note 2: the shared libraries are now building correctly, at"
+	elog "least with and without pvfs2 support (the romio USE flag is no"
+	elog "longer availaible, at least until the configure scripts can be"
+	elog "made to stop finding things when they're disabled)."
+	elog ""
+	elog "Note 3: this package still needs testing with other Fortran90"
 	elog "compilers besides gfortran (gcc4).  The tests also need some"
 	elog "magic to build properly within the portage build environment."
 	elog "(currently the tests only build and run manually)"