From 081b65221fd20448c747e933dc4ba16384e59202 Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Fri, 18 Jun 2010 20:19:06 +0000 Subject: [PATCH] fix Unsafe.pl error with recent openmpi Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- sys-cluster/mpi-dotnet/ChangeLog | 5 ++++- sys-cluster/mpi-dotnet/Manifest | 4 ++-- sys-cluster/mpi-dotnet/files/Unsafe.pl.patch | 10 +++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sys-cluster/mpi-dotnet/ChangeLog b/sys-cluster/mpi-dotnet/ChangeLog index 933af8b655c6..a09bf12133d1 100644 --- a/sys-cluster/mpi-dotnet/ChangeLog +++ b/sys-cluster/mpi-dotnet/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/mpi-dotnet # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/ChangeLog,v 1.5 2010/04/18 12:08:59 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpi-dotnet/ChangeLog,v 1.6 2010/06/18 20:19:06 mabi Exp $ + + 18 Jun 2010; files/Unsafe.pl.patch: + make it work with recent openmpi 18 Apr 2010; mpi-dotnet-1.0.0.ebuild: ppc stable #281207 diff --git a/sys-cluster/mpi-dotnet/Manifest b/sys-cluster/mpi-dotnet/Manifest index ec1b3f4e89e8..32018a9b5919 100644 --- a/sys-cluster/mpi-dotnet/Manifest +++ b/sys-cluster/mpi-dotnet/Manifest @@ -1,7 +1,7 @@ AUX Makefile.am.patch 760 RMD160 6f2755a39e79145dd716a43c0522aa81d3c3574c SHA1 4c501ba3c74c0dd39cdd212b79ae82f1d547d11e SHA256 0502a165bba801c134e0876308574a7c2c9dbbfc72d7e3564ef628a74f96fbf8 -AUX Unsafe.pl.patch 1717 RMD160 1fb5e2abd023a20bede6b7aff207d7d1ae0c5512 SHA1 39c5a62c64f03c18fce14976e3388c68c8a8d424 SHA256 f6b7a64b0009641b38097f1a4ad501c36b6cd20105b255ed2ff201e4a93b131f +AUX Unsafe.pl.patch 2034 RMD160 f8d4c7e2e08904bc5173ba5690955176246be5e4 SHA1 c51ff73bd3d0b0d435b15d447f803d826387fb47 SHA256 d4c33a2fd4fac267b051deab8bb823991bb5fb6b87229197401cccfc3059cd97 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 1405 RMD160 e9da2c78e13e40a539588615773acea8ae4dbb65 SHA1 324dcbab54c906e94a9d597db0b1fbfe078b4415 SHA256 444119c2a82e9e82689e24c8e131d01a403960496d99bd20d812d87d4ec13cf3 -MISC ChangeLog 902 RMD160 ad811fe9a6b4529043c9a2a67478a5ff4d4996bb SHA1 f6e93cd56d47e5c518c3d3cb1cc71ccd30464330 SHA256 272a8520cc4ca60a7f6da89c426fb078b9dffeb69077c014298969968347f623 +MISC ChangeLog 992 RMD160 e23be51b75f7515a6695cc584e0c2208e62bb9c3 SHA1 546173d1a06f6b0567ed39e380e2f3d94b09c190 SHA256 c0dc057ee9ebb84764010176805e4ad8d5dca83f8259a15ffeb8289394a24090 MISC metadata.xml 627 RMD160 d6bcb2571affcb8614b737103edf6d8cf8db0100 SHA1 3efddca47d2a4af932fe050e03b39971553483c1 SHA256 5fa7958728a68ea36c8e3734fbdbb9324d7f95ad3b63c989e575fa7c0494236e diff --git a/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch b/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch index b24cf6db6fa9..1649f3d3ac4e 100644 --- a/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch +++ b/sys-cluster/mpi-dotnet/files/Unsafe.pl.patch @@ -1,5 +1,5 @@ ---- a/MPI/Unsafe.pl 2008-10-06 15:52:17.000000000 +0200 -+++ b/MPI/Unsafe.pl 2010-02-25 21:25:07.000000000 +0100 +--- mpi.net-1.0.0.orig/MPI/Unsafe.pl 2008-10-06 15:52:17.000000000 +0200 ++++ mpi.net-1.0.0/MPI/Unsafe.pl 2010-06-18 21:37:23.000000000 +0200 @@ -96,7 +96,7 @@ } @@ -27,7 +27,7 @@ } elsif ($line =~ /struct $mpi_status_name[^;]*$/) { $in_mpi_status=1; } -@@ -183,7 +183,11 @@ +@@ -183,7 +183,15 @@ # This is a constant we need to replace. my $value = $constants{$constant}; @@ -36,6 +36,10 @@ + # this is for you LAM :-) + print UNSAFE_OUTPUT ("$whitespace","public static readonly $type $constant = mpinet_$constant();\n"); + push (@cbridge_constants, "$type:$constant"); ++ } elsif ($value =~ /OMPI_PREDEFINED_GLOBAL\((.+), (.+)\)/) { ++ # OpenMPI choose to use external variables for these values ++ 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 -- 2.26.2