build fix

Package-Manager: portage-2.1.7.16/cvs/Linux i686

5 files changed, 69 insertions, 23 deletions

diff --git a/sys-cluster/mpi-dotnet/ChangeLog b/sys-cluster/mpi-dotnet/ChangeLog
index 8c92ada41216..7d27a7357d79 100644
--- a/sys-cluster/mpi-dotnet/ChangeLog
+++ b/sys-cluster/mpi-dotnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpi-dotnet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/ChangeLog,v 1.2 2009/05/11 22:15:32 mabi Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/ChangeLog,v 1.3 2010/02/28 22:12:10 mabi Exp $
+
+  28 Feb 2010; <mabi@gentoo.org> mpi-dotnet-1.0.0.ebuild,
+  files/Unsafe.pl.patch, files/configure.ac.patch:
+  fix build failure with mpich2
 
   11 May 2009; <mabi@gentoo.org> mpi-dotnet-1.0.0.ebuild:
   tested on x86 and amd64
diff --git a/sys-cluster/mpi-dotnet/Manifest b/sys-cluster/mpi-dotnet/Manifest
index 5d69d1ac4076..f635ef593485 100644
--- a/sys-cluster/mpi-dotnet/Manifest
+++ b/sys-cluster/mpi-dotnet/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile.am.patch 760 RMD160 6f2755a39e79145dd716a43c0522aa81d3c3574c SHA1 4c501ba3c74c0dd39cdd212b79ae82f1d547d11e SHA256 0502a165bba801c134e0876308574a7c2c9dbbfc72d7e3564ef628a74f96fbf8
-AUX Unsafe.pl.patch 383 RMD160 88c26da75bda24b192c1a44f222285855d6e13a9 SHA1 f6a8f6a976aa70d7ac44bc7c68e696e884c0e599 SHA256 868c438983f92ccae74752acba7dcd0a09d28df264b40960c44cf346d9017ac1
-AUX configure.ac.patch 653 RMD160 b1003db5383037b349d743d69a141a4cbca10e4c SHA1 26a17c65a9b2d62743955174ea5a9fe26f56b238 SHA256 94b019b45cbfd61e6d2003b7aeac5d1c7c37beecc6b27679edf713798516a2d6
+AUX Unsafe.pl.patch 1717 RMD160 1fb5e2abd023a20bede6b7aff207d7d1ae0c5512 SHA1 39c5a62c64f03c18fce14976e3388c68c8a8d424 SHA256 f6b7a64b0009641b38097f1a4ad501c36b6cd20105b255ed2ff201e4a93b131f
+AUX configure.ac.patch 1445 RMD160 aed1fdb7371ca42acb6d5bc90856e118a0216d32 SHA1 5b30545dce5baa5d503816cd2ce93270bf31448c SHA256 f2cddac237bc775fd4de2b302fe775d7811a21c3763300548bc4e27731f2f9bd
 DIST mpi.net-1.0.0.tar.gz 2349909 RMD160 578253d3e2cf97365c4b261cee7752d7aa4922a1 SHA1 717eddba645e3218ea851a8d0d4ab5a33d6979de SHA256 95febe238659f112aa742f40543d7cc5dc8c0abb1958321d54d9cc3926f6b8f4
-EBUILD mpi-dotnet-1.0.0.ebuild 1382 RMD160 fa16d877aee29303dfac0a18a5406a305c9b6b84 SHA1 a5b021106d24cbc9e5ab5d1b426d5b001edec7f5 SHA256 d18cc6d5b21cf8be55df5b4ca3b7795a975743d54f6b484cd5b213a566d0b7bf
-MISC ChangeLog 568 RMD160 ff787dc3923533cbe7b50783ad5154616c67b021 SHA1 f52f98286f8f1029cc963f0f54f6089c3d575798 SHA256 a35f704442a86c848d0f333028abd9a5816a580f0607cf42a00f37e5d52d0aef
+EBUILD mpi-dotnet-1.0.0.ebuild 1405 RMD160 47c539e8da91eaab135e16079b4c49ddfd2069dc SHA1 e9983f199b75214a493fab0fa86ff57ad50255a3 SHA256 6500d19ebb28f91a8b4bd8668cd4653667414dcd47913d8ba10f30f7a5ebde42
+MISC ChangeLog 710 RMD160 060133aaa526e43da9ef298da2c3bb3bb384411b SHA1 02f6fcaeb4378c678a9321c8e51f083bf7da489d SHA256 54a24667c3cee2ffc287c78e37865375607ae9cef71bbbef88de3ba79056db42
 MISC metadata.xml 627 RMD160 d6bcb2571affcb8614b737103edf6d8cf8db0100 SHA1 3efddca47d2a4af932fe050e03b39971553483c1 SHA256 5fa7958728a68ea36c8e3734fbdbb9324d7f95ad3b63c989e575fa7c0494236e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoIphcACgkQfNMcoUhJ7GwHugCcD1wBDKq1oUvVICvsgxQTef6X
-M94An3xY29G13EHRJ/fB6SSD2AJHiQ8R
-=xF+Q
------END PGP SIGNATURE-----
diff --git a/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch b/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch
index 3f28c2a48326..b24cf6db6fa9 100644
--- a/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch
+++ b/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch
@@ -1,5 +1,5 @@
---- mpi.net-1.0.0.orig/MPI/Unsafe.pl	2009-02-03 23:55:48.000000000 +0100
-+++ mpi.net-1.0.0/MPI/Unsafe.pl	2009-02-07 08:24:01.000000000 +0100
+--- a/MPI/Unsafe.pl	2008-10-06 15:52:17.000000000 +0200
++++ b/MPI/Unsafe.pl	2010-02-25 21:25:07.000000000 +0100
 @@ -96,7 +96,7 @@
  }
  
@@ -9,3 +9,34 @@
  $unsafe_input = shift @ARGV;
  $unsafe_output = shift @ARGV;
  $cbridge_output = shift @ARGV;
+@@ -130,7 +130,7 @@
+             }
+             push(@mpi_status_fields, "            $access $type $name;\n");
+         }
+-    } elsif ($line =~ /\s*#\s*define\s*(MPI_[A-Za-z0-9_]*)\s*(.*)/) {
++    } elsif ($line =~ /\s*#define\s+(MPI_[A-Za-z0-9_]*)\s*(.*)/) {
+         # Found an MPI_* constant defined by the preprocessor
+         my $name = $1;
+         my $value = $2;
+@@ -145,7 +145,7 @@
+     } elsif ($in_enum) {
+         parse_enum($line);
+     } elsif ($line =~ /typedef\s+struct\s+([A-Za-z_][A-Za-z0-9_]*)\s+MPI_Status/) {
+-        $mpi_status_name = $2;
++        $mpi_status_name = $1;
+     } elsif ($line =~ /struct $mpi_status_name[^;]*$/) {
+         $in_mpi_status=1;
+     }
+@@ -183,7 +183,11 @@
+ 	    # This is a constant we need to replace.
+ 	    my $value = $constants{$constant};
+ 
+-            if ($value =~ /&/ or $constant =~ /_FN$/) {
++	    if ($value =~ /LAM_MPI_C_.+\(FN|NULL|IGNORE\)/) {
++		# this is for you LAM :-)
++	    	print UNSAFE_OUTPUT ("$whitespace","public static readonly $type $constant = mpinet_$constant();\n");
++		push (@cbridge_constants, "$type:$constant");
++	    } elsif ($value =~ /&/ or $constant =~ /_FN$/) {
+                 # If we're taking the address of something, or if this
+                 # is a _FN constant, it needs to be done in the C
+                 # bridge *unless* this is just a fancy name for the
diff --git a/sys-cluster/mpi-dotnet/files/configure.ac.patch b/sys-cluster/mpi-dotnet/files/configure.ac.patch
index 2c69aa1d5ce6..0b64ae60b600 100644
--- a/sys-cluster/mpi-dotnet/files/configure.ac.patch
+++ b/sys-cluster/mpi-dotnet/files/configure.ac.patch
@@ -1,6 +1,26 @@
---- mpi.net-1.0.0.orig/configure.ac	2009-02-03 23:55:46.000000000 +0100
-+++ mpi.net-1.0.0/configure.ac	2009-02-06 21:59:21.000000000 +0100
-@@ -202,9 +202,16 @@
+--- orig/mpi.net-1.0.0/configure.ac	2008-10-06 15:52:38.000000000 +0200
++++ work/mpi.net-1.0.0/configure.ac	2010-03-01 00:02:49.000000000 +0100
+@@ -164,19 +164,6 @@
+   dnl We do not need the C bridge at all; everything can be done from C#
+   need_cbridge="no"
+ 
+-  real_CC="$CC"
+-  CC="$MPICC"
+-  AC_CHECK_LIB(pmpich,MPI_Init,[HAVE_LIBPMPICH=yes],[HAVE_LIBPMPICH=no],)
+-  AC_CHECK_LIB(mpich,PMPI_Init,[HAVE_LIBMPICH=yes],[HAVE_LIBMPICH=no],)
+-
+-  if test "$HAVE_LIBPMPICH" = "no" ; then 
+-    if test "$HAVE_LIBMPICH" = "yes" ; then 
+-      AC_MSG_ERROR([ MPICH library is built statically. 
+-      Please install MPICH built as a shared library by configuring MPICH with 
+-      the --enable-sharedlibs=??? option)])
+-    fi
+-  fi
+-  CC="real_CC"
+ elif test "$MPI_KIND" = "openmpi" ; then
+   dnl With Open MPI, we need to explicitly determine which libraries
+   dnl the MPI.NET C bridge will need to link against, because libtool
+@@ -202,9 +189,16 @@
  AM_CONDITIONAL(MPINET_CBRIDGE, test "$need_cbridge" = "yes")
  
  dnl Variable substitutions
diff --git a/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild b/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild
index 781143c48544..33a57d3827ae 100644
--- a/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild
+++ b/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild,v 1.2 2009/05/11 22:15:32 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/mpi-dotnet-1.0.0.ebuild,v 1.3 2010/02/28 22:12:10 mabi Exp $
 
 WANT_AUTOTOOLS="2.5"
 inherit autotools mono
@@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 RDEPEND="virtual/mpi
+		!sys-cluster/lam-mpi
 		>=dev-lang/mono-2.0"
 DEPEND="${RDEPEND}
 		dev-lang/perl"