[gentoo-commits] gentoo-x86 commit in sys-cluster/mpi-dotnet/files: configure.ac.patch Unsafe.pl.patch

[gentoo-commits] gentoo-x86 commit in sys-cluster/mpi-dotnet/files: configure.ac.patch Unsafe.pl.patch

[Matti Bickel (mabi)]

mabi        10/02/28 22:12:12

  Modified:             configure.ac.patch Unsafe.pl.patch
  Log:
  build fix
  (Portage version: 2.1.7.16/cvs/Linux i686)

Revision  Changes    Path
1.2                  sys-cluster/mpi-dotnet/files/configure.ac.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?r1=1.1&r2=1.2

Index: configure.ac.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.ac.patch	17 Apr 2009 13:07:10 -0000	1.1
+++ configure.ac.patch	28 Feb 2010 22:12:11 -0000	1.2
@@ -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



1.2                  sys-cluster/mpi-dotnet/files/Unsafe.pl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?r1=1.1&r2=1.2

Index: Unsafe.pl.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Unsafe.pl.patch	17 Apr 2009 13:07:10 -0000	1.1
+++ Unsafe.pl.patch	28 Feb 2010 22:12:11 -0000	1.2
@@ -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