| 1 |
mabi 10/02/28 22:12:12 |
| 2 |
|
| 3 |
Modified: configure.ac.patch Unsafe.pl.patch |
| 4 |
Log: |
| 5 |
build fix |
| 6 |
(Portage version: 2.1.7.16/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sys-cluster/mpi-dotnet/files/configure.ac.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: configure.ac.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/files/configure.ac.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- configure.ac.patch 17 Apr 2009 13:07:10 -0000 1.1 |
| 22 |
+++ configure.ac.patch 28 Feb 2010 22:12:11 -0000 1.2 |
| 23 |
@@ -1,6 +1,26 @@ |
| 24 |
---- mpi.net-1.0.0.orig/configure.ac 2009-02-03 23:55:46.000000000 +0100 |
| 25 |
-+++ mpi.net-1.0.0/configure.ac 2009-02-06 21:59:21.000000000 +0100 |
| 26 |
-@@ -202,9 +202,16 @@ |
| 27 |
+--- orig/mpi.net-1.0.0/configure.ac 2008-10-06 15:52:38.000000000 +0200 |
| 28 |
++++ work/mpi.net-1.0.0/configure.ac 2010-03-01 00:02:49.000000000 +0100 |
| 29 |
+@@ -164,19 +164,6 @@ |
| 30 |
+ dnl We do not need the C bridge at all; everything can be done from C# |
| 31 |
+ need_cbridge="no" |
| 32 |
+ |
| 33 |
+- real_CC="$CC" |
| 34 |
+- CC="$MPICC" |
| 35 |
+- AC_CHECK_LIB(pmpich,MPI_Init,[HAVE_LIBPMPICH=yes],[HAVE_LIBPMPICH=no],) |
| 36 |
+- AC_CHECK_LIB(mpich,PMPI_Init,[HAVE_LIBMPICH=yes],[HAVE_LIBMPICH=no],) |
| 37 |
+- |
| 38 |
+- if test "$HAVE_LIBPMPICH" = "no" ; then |
| 39 |
+- if test "$HAVE_LIBMPICH" = "yes" ; then |
| 40 |
+- AC_MSG_ERROR([ MPICH library is built statically. |
| 41 |
+- Please install MPICH built as a shared library by configuring MPICH with |
| 42 |
+- the --enable-sharedlibs=??? option)]) |
| 43 |
+- fi |
| 44 |
+- fi |
| 45 |
+- CC="real_CC" |
| 46 |
+ elif test "$MPI_KIND" = "openmpi" ; then |
| 47 |
+ dnl With Open MPI, we need to explicitly determine which libraries |
| 48 |
+ dnl the MPI.NET C bridge will need to link against, because libtool |
| 49 |
+@@ -202,9 +189,16 @@ |
| 50 |
AM_CONDITIONAL(MPINET_CBRIDGE, test "$need_cbridge" = "yes") |
| 51 |
|
| 52 |
dnl Variable substitutions |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.2 sys-cluster/mpi-dotnet/files/Unsafe.pl.patch |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?rev=1.2&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?rev=1.2&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch?r1=1.1&r2=1.2 |
| 61 |
|
| 62 |
Index: Unsafe.pl.patch |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch,v |
| 65 |
retrieving revision 1.1 |
| 66 |
retrieving revision 1.2 |
| 67 |
diff -u -r1.1 -r1.2 |
| 68 |
--- Unsafe.pl.patch 17 Apr 2009 13:07:10 -0000 1.1 |
| 69 |
+++ Unsafe.pl.patch 28 Feb 2010 22:12:11 -0000 1.2 |
| 70 |
@@ -1,5 +1,5 @@ |
| 71 |
---- mpi.net-1.0.0.orig/MPI/Unsafe.pl 2009-02-03 23:55:48.000000000 +0100 |
| 72 |
-+++ mpi.net-1.0.0/MPI/Unsafe.pl 2009-02-07 08:24:01.000000000 +0100 |
| 73 |
+--- a/MPI/Unsafe.pl 2008-10-06 15:52:17.000000000 +0200 |
| 74 |
++++ b/MPI/Unsafe.pl 2010-02-25 21:25:07.000000000 +0100 |
| 75 |
@@ -96,7 +96,7 @@ |
| 76 |
} |
| 77 |
|
| 78 |
@@ -9,3 +9,34 @@ |
| 79 |
$unsafe_input = shift @ARGV; |
| 80 |
$unsafe_output = shift @ARGV; |
| 81 |
$cbridge_output = shift @ARGV; |
| 82 |
+@@ -130,7 +130,7 @@ |
| 83 |
+ } |
| 84 |
+ push(@mpi_status_fields, " $access $type $name;\n"); |
| 85 |
+ } |
| 86 |
+- } elsif ($line =~ /\s*#\s*define\s*(MPI_[A-Za-z0-9_]*)\s*(.*)/) { |
| 87 |
++ } elsif ($line =~ /\s*#define\s+(MPI_[A-Za-z0-9_]*)\s*(.*)/) { |
| 88 |
+ # Found an MPI_* constant defined by the preprocessor |
| 89 |
+ my $name = $1; |
| 90 |
+ my $value = $2; |
| 91 |
+@@ -145,7 +145,7 @@ |
| 92 |
+ } elsif ($in_enum) { |
| 93 |
+ parse_enum($line); |
| 94 |
+ } elsif ($line =~ /typedef\s+struct\s+([A-Za-z_][A-Za-z0-9_]*)\s+MPI_Status/) { |
| 95 |
+- $mpi_status_name = $2; |
| 96 |
++ $mpi_status_name = $1; |
| 97 |
+ } elsif ($line =~ /struct $mpi_status_name[^;]*$/) { |
| 98 |
+ $in_mpi_status=1; |
| 99 |
+ } |
| 100 |
+@@ -183,7 +183,11 @@ |
| 101 |
+ # This is a constant we need to replace. |
| 102 |
+ my $value = $constants{$constant}; |
| 103 |
+ |
| 104 |
+- if ($value =~ /&/ or $constant =~ /_FN$/) { |
| 105 |
++ if ($value =~ /LAM_MPI_C_.+\(FN|NULL|IGNORE\)/) { |
| 106 |
++ # this is for you LAM :-) |
| 107 |
++ print UNSAFE_OUTPUT ("$whitespace","public static readonly $type $constant = mpinet_$constant();\n"); |
| 108 |
++ push (@cbridge_constants, "$type:$constant"); |
| 109 |
++ } elsif ($value =~ /&/ or $constant =~ /_FN$/) { |
| 110 |
+ # If we're taking the address of something, or if this |
| 111 |
+ # is a _FN constant, it needs to be done in the C |
| 112 |
+ # bridge *unless* this is just a fancy name for the |
Archives