From 0e6002e22d1d04df4ca169ec011760cfe9d32984 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 16 Feb 2014 19:46:56 +0100 Subject: [PATCH] boost: remove long_desc; fix armv7 cross build. --- srcpkgs/boost/template | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 7860e19bc3b..c5449569952 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost version=1.54.0 -revision=1 +revision=2 _boostver="$(echo $version|sed 's|\.|_|g')" wrksrc="${pkgname}_${_boostver}" makedepends="zlib-devel bzip2-devel icu-devel>=49.1" @@ -11,11 +11,6 @@ homepage="http://www.boost.org/" license="Boost Software License 1.0" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${_boostver}.tar.bz2" checksum=047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d -long_desc=" - The Boost web site provides free peer-reviewed portable C++ source libraries. - The emphasis is on libraries which work well with the C++ Standard Library. - The libraries are intended to be widely useful, and are in regular use by - thousands of programmers across a broad spectrum of applications." if [ -z "$CROSS_BUILD" ]; then # XXX boost-jam and boost-python subpkgs. @@ -40,14 +35,14 @@ do_build() { do_install() { # Install bjam - if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then - _bindir="bin.linuxx86" - elif [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - _bindir="bin.linuxx86_64" - elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then - _bindir="bin.linuxarm" + case "$XBPS_TARGET_MACHINE" in + i686*) _bindir="bin.linuxx86";; + x86_64*) _bindir="bin.linuxx86_64";; + arm*) _bindir="bin.linuxarm";; + esac + if [ -z "$CROSS_BUILD" ]; then + vinstall bjam 755 usr/bin fi - [ -z "$CROSS_BUILD" ] && vinstall bjam 755 usr/bin # Install headers/libs ./bjam --prefix=${DESTDIR}/usr install