Resolves bug #97416. Thanks to Krzysiek Pawlik for the patch and Kamil Bruzynski for testing it on amd64. Now it actually works on amd64!

(Portage version: 2.0.51.22-r1)

5 files changed, 25 insertions, 37 deletions

diff --git a/dev-util/jam/ChangeLog b/dev-util/jam/ChangeLog
index 67592286650a..c0ad4ec99429 100644
--- a/dev-util/jam/ChangeLog
+++ b/dev-util/jam/ChangeLog
@@ -1,39 +1,11 @@
 # ChangeLog for dev-util/jam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.12 2005/07/01 16:30:40 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.13 2005/07/02 00:25:41 chriswhite Exp $
 
-  01 Jul 2005; Ferris McCormick <fmccor@gentoo.org> jam-2.5-r1.ebuild:
-  Add ~sparc keyword.  Builds and runs on sparc, and is needed for a
-  few packages and for some third-party openMPI testing (boost library).
+*jam-2.5-r1 (02 Jul 2005)
 
-*jam-2.5-r1 (03 May 2005)
+  02 Jul 2005; Chris White <chriswhite@gentoo.org>
+  +files/jam-2.5-amd64.patch, -jam-2.5-r1.ebuild, +jam-2.5-r2.ebuild:
+  Resolves bug #97416. Thanks to Krzysiek Pawlik for the patch and Kamil
+  Bruzynski for testing it on amd64. Now it actually works on amd64!
 
-  03 May 2005; Mike Frysinger <vapier@gentoo.org> +files/jam-2.5-cxx.patch,
-  +jam-2.5-r1.ebuild:
-  Make the default C++ compiler c++ instead of cc and add support for .cxx
-  #87974 by Krzysiek Pawlik.
-
-  01 May 2004; Jeremy Huddleston <eradicator@gentoo.org> jam-2.5.ebuild:
-  blocking on !dev-util/boost-jam
-
-*jam-2.5 (16 Jun 2003)
-
-  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #22770 and changed src to grab tar instead of zip.
-
-*jam-2.4 (03 Nov 2002)
-
-  27 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
-  Added edos2unix support since gcc-2.x dies on the windows file format.
-
-  16 Apr 2003; Luca barbato <lu_zero@gentoo.org> :
-  added ~ppc KEYWORD
-  
-  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Tab fixes, etc.  Mark stable as it test fine, and not critical
-  ebuild.  I should note that Brian Olsen <bnolsen@attbi.com> also
-  submitted an ebuild long ago, but I could just never get to
-  it (bug #4583).
-
-  03 Nov 2002; J Robert Ray <jrray@gentoo.org> :
-  New ebuild, submitted by Jeffrey Palmer <jeffrey.palmer@acm.org>.
diff --git a/dev-util/jam/Manifest b/dev-util/jam/Manifest
index 6370592f7de4..f2aca322bf0d 100644
--- a/dev-util/jam/Manifest
+++ b/dev-util/jam/Manifest
@@ -1,6 +1,7 @@
 MD5 a7e5991b9ad8683c35906c81833de75b ChangeLog 1502
 MD5 a5686e3c1ed6f476191f125c7589d421 jam-2.5.ebuild 788
-MD5 0239156d24e0469c82aab518de46f4e1 jam-2.5-r1.ebuild 896
+MD5 75d70d2006531921ef37acdcf0ed986d jam-2.5-r2.ebuild 935
 MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5 56
-MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5-r1 56
 MD5 d1bfd7c9f477fe91b1cc27f0324591a0 files/jam-2.5-cxx.patch 1089
+MD5 355cd982c580f42f3401def29ad621fe files/jam-2.5-amd64.patch 334
+MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5-r2 56
diff --git a/dev-util/jam/files/digest-jam-2.5-r1 b/dev-util/jam/files/digest-jam-2.5-r2
index c6bba9924280..c6bba9924280 100644
--- a/dev-util/jam/files/digest-jam-2.5-r1
+++ b/dev-util/jam/files/digest-jam-2.5-r2
diff --git a/dev-util/jam/files/jam-2.5-amd64.patch b/dev-util/jam/files/jam-2.5-amd64.patch
new file mode 100644
index 000000000000..dfc715577398
--- /dev/null
+++ b/dev-util/jam/files/jam-2.5-amd64.patch
@@ -0,0 +1,14 @@
+diff -Nru jam-2.5.original/jam.h jam-2.5/jam.h
+--- jam-2.5.original/jam.h	2003-04-23 06:45:51.000000000 +0200
++++ jam-2.5/jam.h	2005-07-01 23:45:53.000000000 +0200
+@@ -449,6 +449,10 @@
+ # define OSPLAT "OSPLAT=390"
+ # endif
+ 
++# ifdef __amd64__
++# define OSPLAT "OSPLAT=AMD64"
++# endif
++
+ # ifndef OSPLAT
+ # define OSPLAT ""
+ # endif
diff --git a/dev-util/jam/jam-2.5-r1.ebuild b/dev-util/jam/jam-2.5-r2.ebuild
index d9afd26503bd..5cd382e6df52 100644
--- a/dev-util/jam/jam-2.5-r1.ebuild
+++ b/dev-util/jam/jam-2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r1.ebuild,v 1.2 2005/07/01 16:30:40 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r2.ebuild,v 1.1 2005/07/02 00:25:41 chriswhite Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-cxx.patch
+	epatch "${FILESDIR}"/${P}-amd64.patch
 }
 
 src_compile() {