summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Lashley <malc@gentoo.org>2004-07-04 10:40:25 +0000
committerMalcolm Lashley <malc@gentoo.org>2004-07-04 10:40:25 +0000
commit2d7c99ca7c7ae869b49be3277104717d76425bd6 (patch)
tree928a9463794db66732ffee712108f44231a1cf34
parent~sparc -amd64. (Manifest recommit) (diff)
downloadgentoo-2-2d7c99ca7c7ae869b49be3277104717d76425bd6.tar.gz
gentoo-2-2d7c99ca7c7ae869b49be3277104717d76425bd6.tar.bz2
gentoo-2-2d7c99ca7c7ae869b49be3277104717d76425bd6.zip
Fixup amd64 support, closes bug #49545
-rw-r--r--dev-util/boost-jam/ChangeLog9
-rw-r--r--dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild6
-rw-r--r--dev-util/boost-jam/files/boost-jam-3.1.9-amd64.patch13
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-util/boost-jam/ChangeLog b/dev-util/boost-jam/ChangeLog
index 789577b4ac5b..8a8d1f18a615 100644
--- a/dev-util/boost-jam/ChangeLog
+++ b/dev-util/boost-jam/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/boost-jam
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-jam/ChangeLog,v 1.7 2004/06/25 02:21:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-jam/ChangeLog,v 1.8 2004/07/04 10:40:25 malc Exp $
+
+*boost-jam-3.1.9-r1 (04 Jul 2004)
+
+ 04 Jul 2004; <malc@gentoo.org> +files/boost-jam-3.1.9-amd64.patch,
+ boost-jam-3.1.9-r1.ebuild:
+ Patch for proper amd64 compilation - fixes bug #49545
+ Change ebuild to properly die on dobin if make 'succeeds' but does not make any binaries (as it will if the arch is unsupported)
14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
files/boost-jam-3.1.9-dir.patch:
diff --git a/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild b/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild
index c6fca95d2853..12da7719af7d 100644
--- a/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild
+++ b/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild,v 1.2 2004/06/25 02:21:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-jam/boost-jam-3.1.9-r1.ebuild,v 1.3 2004/07/04 10:40:25 malc Exp $
IUSE=""
@@ -24,6 +24,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-dir.patch
+ epatch ${FILESDIR}/${P}-amd64.patch
}
src_compile() {
@@ -35,5 +36,6 @@ src_install() {
dohtml Jam.html
cd ${S}/bin.linux${ARCH}
- dobin bjam jam mkjambase yyacc
+ dobin bjam jam mkjambase yyacc || die "Unable to install binaries."
+ /* add check or ebuild will happilly succeed on unsupported archs and install only docs */
}
diff --git a/dev-util/boost-jam/files/boost-jam-3.1.9-amd64.patch b/dev-util/boost-jam/files/boost-jam-3.1.9-amd64.patch
new file mode 100644
index 000000000000..96d05d4c9ddf
--- /dev/null
+++ b/dev-util/boost-jam/files/boost-jam-3.1.9-amd64.patch
@@ -0,0 +1,13 @@
+--- boost-jam-3.1.9/work/boost-jam-3.1.9/jam.h 2003-10-30 13:55:46.000000000 +0000
++++ boost-jam-3.1.9_malc/work/boost-jam-3.1.9/jam.h 2004-06-07 16:23:57.302534144 +0000
+@@ -455,6 +455,10 @@
+ # define OSPLAT "OSPLAT=IA64"
+ # endif
+
++# if defined( __x86_64__ )
++# define OSPLAT "OSPLAT=AMD64"
++# endif
++
+ # ifdef __s390__
+ # define OSPLAT "OSPLAT=390"
+ # endif