From ae25dc4dfdb7b4f7fe20ba1456ef7462e2a44a6c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 9 Aug 2013 09:54:16 +0000
Subject: main/boots: build fix

new abuild purge $pkgdir before package. we need wait with installing
things in "$pkgdir" til 'package' stage.
---
 main/boost/APKBUILD | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'main')

diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 86bd0b019..3d22e8d9d 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -72,31 +72,31 @@ _options="--user-config=\"$_builddir/user-config.jam\"
 	-j${JOBS:-2}
 "
 
-build() { 
+build() {
 	msg "Building bjam"
 	export BOOST_ROOT="$_builddir"
 	cd "$_builddir"/tools/build/v2/engine
 	CC= ./build.sh cc || return 1
-	_bindir="bin.linuxx86"
-	[ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-	install -m755 -d "$pkgdir"/usr/bin
-	install -m755 ${_bindir}/bjam "$pkgdir"/usr/bin/bjam || return 1
-	_bjam="$pkgdir"/usr/bin/bjam
+	_bindir="$PWD/bin.linux$CARCH"
+	_bjam="$_bindir"/bjam
 
 	msg "Building bcp"
 	cd "${_builddir}"/tools/bcp
 	"${_bjam}" -j${JOBS:-2} || return 1
-	install -m755 "$srcdir"/${pkgname}_${_ver}/dist/bin/bcp \
-		"$pkgdir"/usr/bin/bcp || return 1
 
 	msg "Building boost"
 	cd "$_builddir"
-	"${_bjam}" $_options 
+	"${_bjam}" $_options
 }
 
 package() {
 	cd "$_builddir"
 	export BOOST_ROOT="$_builddir"
+	local _bindir="$_builddir"/tools/build/v2/engine/bin.linux${CARCH}
+	install -m755 -d "$pkgdir"/usr/bin
+	install -m755 ${_bindir}/bjam "$pkgdir"/usr/bin/bjam || return 1
+	install -m755 "$srcdir"/${pkgname}_${_ver}/dist/bin/bcp \
+		"$pkgdir"/usr/bin/bcp || return 1
 	_bjam="$pkgdir"/usr/bin/bjam
 	"${_bjam}" $_options \
 		--includedir="$pkgdir"/usr/include \
-- 
cgit v1.2.3