From: Daniel Goller <morfic@gentoo.org>
Date: Sat, 11 Dec 2004 17:31:52 +0000 (+0000)
Subject: Added ${arch} to bjam path
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b47150764af1caf812a36a601e168c3b2080962b;p=gentoo.git

Added ${arch} to bjam path
---

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 726a411e4fd0..a8ba92b1e7ff 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.23 2004/12/10 19:07:21 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.24 2004/12/11 17:31:52 morfic Exp $
+
+  11 Dec 2004; Daniel Goller <morfic@gentoo.org> boost-1.32.0.ebuild:
+  Added ${arch} to bjam path
 
   10 Dec 2004; Daniel Goller <morfic@gentoo.org> boost-1.31.0.ebuild:
   Stable on ppc
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 56edeb5e8728..0015072c2b91 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA1
 
 MD5 c0e0b430578e177a32295ce8f365302d boost-1.31.0.ebuild 3967
-MD5 dbdef754b4d79287299d40fb7c4b430f boost-1.32.0.ebuild 2140
+MD5 abe0fbb744a404dc651b9751712dabe8 boost-1.32.0.ebuild 2200
 MD5 7a5736de479368e026895776885a1f4c boost-1.29.0.ebuild 1428
 MD5 c38336b27cb2a10759ade6f16799d051 boost-1.30.0.ebuild 2977
-MD5 ec284f7cd8be62ce7592d9e40e6856e0 ChangeLog 3897
+MD5 baabece31690a303706b234341dee8b3 ChangeLog 3997
 MD5 19f97285acdda370e331ee909e26df4c metadata.xml 340
 MD5 6fd34399d93efc1de1221666ed6d37d1 boost-1.30.2.ebuild 2964
 MD5 ed187a2b2048776a7e5b27060d96938c files/digest-boost-1.29.0 65
@@ -16,7 +16,7 @@ MD5 1d06245b53e5677556ae22e5f60f0df3 files/digest-boost-1.32.0 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBufPSUpKYMelfdYERAg16AJ0USEUVGVjwOq+/R8/UgZbG5zzweQCZAY4D
-nm0ZgmlQxTiMRJ5dJwn6XVk=
-=lZ+e
+iD8DBQFBuy74UpKYMelfdYERAmuHAJ96QhoKkYWrZTrGtreyIpKRD38apQCdFcOU
+wC0MFm4TquAMCytois62hX4=
+=ZhPb
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.32.0.ebuild b/dev-libs/boost/boost-1.32.0.ebuild
index fde63f7d39a1..0844c81e47d3 100644
--- a/dev-libs/boost/boost-1.32.0.ebuild
+++ b/dev-libs/boost/boost-1.32.0.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-libs/boost/boost-1.32.0.ebuild,v 1.1 2004/12/10 18:08:14 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.32.0.ebuild,v 1.2 2004/12/11 17:31:52 morfic Exp $
 
 # This ebuild was generated by Ebuilder v0.4.
 
@@ -27,27 +27,27 @@ src_compile() {
 		cd ${S}
 
 		# actual build
-		./tools/build/jam_src/bin.linux/bjam \
+		./tools/build/jam_src/bin.linux${arch}/bjam \
 				-sBOOST_ROOT=${S} \
 				-sPYTHON_ROOT=/usr \
 				-sPYTHON_VERSION=${PYTHON_VERSION} \
 				-sTOOLS=gcc \
 		--prefix=${D}/usr \
 		--layout=system \
-		stage
+		stage || die "stage failed"
 }
 
 src_install () {
 		local PYTHON_VERSION=$(/usr/bin/python -V 2>&1 | sed 's/Python \([0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')
 
-		./tools/build/jam_src/bin.linux/bjam \
+		./tools/build/jam_src/bin.linux${arch}/bjam \
 				-sBOOST_ROOT=${S} \
 				-sPYTHON_ROOT=/usr \
 				-sPYTHON_VERSION=${PYTHON_VERSION} \
 				-sTOOLS=gcc \
 		--prefix=${D}/usr \
 		--layout=system \
-		install
+		install || die "install failed"
 
 	# Install documentation; seems to be mostly under ${S}/lib
 	   # install documentation