From 25fdcd91661ca23f32cd2d8aa995f2f529487a06 Mon Sep 17 00:00:00 2001 From: Pieter van den Abeele Date: Thu, 13 Jul 2006 00:42:04 +0000 Subject: Closes bug #135355 and also adds a gcc-4.1 patch (Portage version: 2.1.1_pre2-r6) --- sys-cluster/pvm/ChangeLog | 5 ++- sys-cluster/pvm/files/digest-pvm-3.4.4-r1 | 2 ++ sys-cluster/pvm/files/digest-pvm-3.4.4-r2 | 2 ++ sys-cluster/pvm/files/digest-pvm-3.4.4-r3 | 2 ++ sys-cluster/pvm/files/digest-pvm-3.4.5 | 2 ++ sys-cluster/pvm/files/digest-pvm-3.4.5-r1 | 2 ++ sys-cluster/pvm/files/digest-pvm-3.4.5-r2 | 2 ++ sys-cluster/pvm/files/pvm-3.4.5-gcc-4.1.patch | 49 +++++++++++++++++++++++++++ sys-cluster/pvm/files/pvm-3.4.5-ppc64.patch | 11 ++++++ sys-cluster/pvm/pvm-3.4.5-r2.ebuild | 5 ++- 10 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 sys-cluster/pvm/files/pvm-3.4.5-gcc-4.1.patch create mode 100644 sys-cluster/pvm/files/pvm-3.4.5-ppc64.patch (limited to 'sys-cluster/pvm') diff --git a/sys-cluster/pvm/ChangeLog b/sys-cluster/pvm/ChangeLog index b377f1c9a034..a1e9aa26a908 100644 --- a/sys-cluster/pvm/ChangeLog +++ b/sys-cluster/pvm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/pvm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.29 2006/05/07 20:41:18 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/ChangeLog,v 1.30 2006/07/13 00:42:04 pvdabeel Exp $ + + 13 Jul 2006; Pieter Van den Abeele pvm-3.4.5-r2.ebuild: + PPC64 fix and GCC-4.1 fix 07 May 2006; Markus Rothe pvm-3.4.5-r2.ebuild: Stable on ppc64 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.4-r1 b/sys-cluster/pvm/files/digest-pvm-3.4.4-r1 index d82d614afdd9..f3962e402855 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.4-r1 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.4-r1 @@ -1 +1,3 @@ MD5 806abe9a866eab5981383c17ff9ed175 pvm3.4.4.tgz 967852 +RMD160 12e1efa58ffd9ad380ca036910d389a21e925c94 pvm3.4.4.tgz 967852 +SHA256 309643786738d2620bc0031201e4c77c5e6d595fdeb074acbf80926accf9ead5 pvm3.4.4.tgz 967852 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.4-r2 b/sys-cluster/pvm/files/digest-pvm-3.4.4-r2 index d82d614afdd9..f3962e402855 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.4-r2 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.4-r2 @@ -1 +1,3 @@ MD5 806abe9a866eab5981383c17ff9ed175 pvm3.4.4.tgz 967852 +RMD160 12e1efa58ffd9ad380ca036910d389a21e925c94 pvm3.4.4.tgz 967852 +SHA256 309643786738d2620bc0031201e4c77c5e6d595fdeb074acbf80926accf9ead5 pvm3.4.4.tgz 967852 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.4-r3 b/sys-cluster/pvm/files/digest-pvm-3.4.4-r3 index d82d614afdd9..f3962e402855 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.4-r3 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.4-r3 @@ -1 +1,3 @@ MD5 806abe9a866eab5981383c17ff9ed175 pvm3.4.4.tgz 967852 +RMD160 12e1efa58ffd9ad380ca036910d389a21e925c94 pvm3.4.4.tgz 967852 +SHA256 309643786738d2620bc0031201e4c77c5e6d595fdeb074acbf80926accf9ead5 pvm3.4.4.tgz 967852 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.5 b/sys-cluster/pvm/files/digest-pvm-3.4.5 index 6de3184f5d12..7d49c1b5db4a 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.5 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.5 @@ -1 +1,3 @@ MD5 086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz 979201 +RMD160 22244c42a964d74ada43fb1379d7b4179afc7f9e pvm3.4.5.tgz 979201 +SHA256 546ba92e0aad6be903601e514fce7b6cc64216f1cb3124b46ec48029104cdea3 pvm3.4.5.tgz 979201 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.5-r1 b/sys-cluster/pvm/files/digest-pvm-3.4.5-r1 index 6de3184f5d12..7d49c1b5db4a 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.5-r1 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.5-r1 @@ -1 +1,3 @@ MD5 086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz 979201 +RMD160 22244c42a964d74ada43fb1379d7b4179afc7f9e pvm3.4.5.tgz 979201 +SHA256 546ba92e0aad6be903601e514fce7b6cc64216f1cb3124b46ec48029104cdea3 pvm3.4.5.tgz 979201 diff --git a/sys-cluster/pvm/files/digest-pvm-3.4.5-r2 b/sys-cluster/pvm/files/digest-pvm-3.4.5-r2 index 6de3184f5d12..7d49c1b5db4a 100644 --- a/sys-cluster/pvm/files/digest-pvm-3.4.5-r2 +++ b/sys-cluster/pvm/files/digest-pvm-3.4.5-r2 @@ -1 +1,3 @@ MD5 086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz 979201 +RMD160 22244c42a964d74ada43fb1379d7b4179afc7f9e pvm3.4.5.tgz 979201 +SHA256 546ba92e0aad6be903601e514fce7b6cc64216f1cb3124b46ec48029104cdea3 pvm3.4.5.tgz 979201 diff --git a/sys-cluster/pvm/files/pvm-3.4.5-gcc-4.1.patch b/sys-cluster/pvm/files/pvm-3.4.5-gcc-4.1.patch new file mode 100644 index 000000000000..ba788b0c4116 --- /dev/null +++ b/sys-cluster/pvm/files/pvm-3.4.5-gcc-4.1.patch @@ -0,0 +1,49 @@ +Files pvm3.orig/bin/LINUXPPC/pvm_gstat and pvm3/bin/LINUXPPC/pvm_gstat differ +Files pvm3.orig/bin/LINUXPPC/pvmgroups and pvm3/bin/LINUXPPC/pvmgroups differ +Files pvm3.orig/bin/LINUXPPC/pvmgs and pvm3/bin/LINUXPPC/pvmgs differ +Files pvm3.orig/bin/LINUXPPC/tracer and pvm3/bin/LINUXPPC/tracer differ +Files pvm3.orig/bin/LINUXPPC/trcsort and pvm3/bin/LINUXPPC/trcsort differ +Files pvm3.orig/lib/LINUXPPC/libfpvm3.a and pvm3/lib/LINUXPPC/libfpvm3.a differ +Files pvm3.orig/lib/LINUXPPC/libgpvm3.a and pvm3/lib/LINUXPPC/libgpvm3.a differ +Files pvm3.orig/lib/LINUXPPC/libpvm3.a and pvm3/lib/LINUXPPC/libpvm3.a differ +Files pvm3.orig/lib/LINUXPPC/libpvmtrc.a and pvm3/lib/LINUXPPC/libpvmtrc.a differ +Files pvm3.orig/lib/LINUXPPC/pvm and pvm3/lib/LINUXPPC/pvm differ +Files pvm3.orig/lib/LINUXPPC/pvmd3 and pvm3/lib/LINUXPPC/pvmd3 differ +Files pvm3.orig/lib/LINUXPPC/pvmgs and pvm3/lib/LINUXPPC/pvmgs differ +diff -urN pvm3.orig/src/global.c pvm3/src/global.c +--- pvm3.orig/src/global.c 2006-07-13 02:29:25.000000000 +0200 ++++ pvm3/src/global.c 2006-07-13 02:31:06.000000000 +0200 +@@ -205,7 +205,7 @@ + + /* Trace Data Identifier Structures */ + +-struct Pvmtevdid pvmtevdidlist[] = ++struct Pvmtevdid* pvmtevdidlist = + { + /* TEV_DID_AN */ "AN", "PVM Architecture Name", + /* TEV_DID_AC */ "AC", "PVM Architecture Code", +@@ -335,7 +335,7 @@ + + /* Trace Event Info */ + +-struct Pvmtevinfo pvmtevinfo[] = ++struct Pvmtevinfo* pvmtevinfo = + { + /* TEV_ADDHOSTS */ "addhosts", 0, { 0, 0 }, { 0, 0 }, 0, + /* TEV_BARRIER */ "barrier", 0, { 0, 0 }, { 0, 0 }, 0, +diff -urN pvm3.orig/src/global.h pvm3/src/global.h +--- pvm3.orig/src/global.h 2006-07-13 02:29:52.000000000 +0200 ++++ pvm3/src/global.h 2006-07-13 02:29:14.000000000 +0200 +@@ -318,7 +318,7 @@ + + /* General Trace Globals Declarations */ + +-extern struct Pvmtevdid pvmtevdidlist[]; ++extern struct Pvmtevdid* pvmtevdidlist; + +-extern struct Pvmtevinfo pvmtevinfo[]; ++extern struct Pvmtevinfo* pvmtevinfo; + +Files pvm3.orig/tracer/LINUXPPC/libpvmtrc.a and pvm3/tracer/LINUXPPC/libpvmtrc.a differ +Files pvm3.orig/tracer/LINUXPPC/tracer and pvm3/tracer/LINUXPPC/tracer differ +Files pvm3.orig/tracer/LINUXPPC/trcsort and pvm3/tracer/LINUXPPC/trcsort differ diff --git a/sys-cluster/pvm/files/pvm-3.4.5-ppc64.patch b/sys-cluster/pvm/files/pvm-3.4.5-ppc64.patch new file mode 100644 index 000000000000..7b6b2c721e81 --- /dev/null +++ b/sys-cluster/pvm/files/pvm-3.4.5-ppc64.patch @@ -0,0 +1,11 @@ +diff -urN pvm3.orig/lib/pvmgetarch pvm3/lib/pvmgetarch +--- pvm3.orig/lib/pvmgetarch 2006-06-03 08:38:59.000000000 +0200 ++++ pvm3/lib/pvmgetarch 2006-06-03 08:40:49.000000000 +0200 +@@ -75,6 +75,7 @@ + Linux,sparc* ) ARCH=LINUXSPARC ;; + Linux,hp_pa ) ARCH=LINUXHPPA ;; + Linux,ppc ) ARCH=LINUXPPC ;; ++ Linux,ppc64 ) ARCH=LINUXPPC ;; + Linux,s390 ) ARCH=LINUXS390 ;; + Linux,s390x ) ARCH=LINUXS390X ;; + Linux,m68k ) ARCH=LINUXATARI ;; diff --git a/sys-cluster/pvm/pvm-3.4.5-r2.ebuild b/sys-cluster/pvm/pvm-3.4.5-r2.ebuild index cb3435d21f5e..2a2dc20ec6a8 100644 --- a/sys-cluster/pvm/pvm-3.4.5-r2.ebuild +++ b/sys-cluster/pvm/pvm-3.4.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r2.ebuild,v 1.5 2006/05/07 20:41:18 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvm/pvm-3.4.5-r2.ebuild,v 1.6 2006/07/13 00:42:04 pvdabeel Exp $ inherit eutils @@ -24,11 +24,14 @@ src_unpack() { epatch ${FILESDIR}/${P}-strerror.patch || die epatch ${FILESDIR}/${P}-extra-arches.patch || die epatch ${FILESDIR}/${P}-x86_64-segfault.patch || die + epatch ${FILESDIR}/${P}-gcc-4.1.patch || die # setup def files for other archs cp conf/LINUX64.def conf/LINUXPPC64.def cp conf/LINUX64.m4 conf/LINUXPPC64.m4 + epatch ${FILESDIR}/${P}-ppc64.patch || die + # s390 should go in this list if there is ever interest # Patch the 64bit def files to look in lib64 dirs as well for libraries. for I in 64 PPC64; do -- cgit v1.2.3-65-gdbad