[arch-commits] CVS update of extra/lib/boost (PKGBUILD)

[Jan de Groot]

    Date: Wednesday, May 30, 2007 @ 08:20:51
  Author: jgc
    Path: /home/cvs-extra/extra/lib/boost

Modified: PKGBUILD (1.18 -> 1.19)

upgpkg: boost 1.34.0-2
Build bjam with -fno-strict-aliasing in CFLAGS, fixes build with gcc 4.2.0.
Add ||return 1 checks to detect build failure


----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)


Index: extra/lib/boost/PKGBUILD
diff -u extra/lib/boost/PKGBUILD:1.18 extra/lib/boost/PKGBUILD:1.19
--- extra/lib/boost/PKGBUILD:1.18	Wed May 30 07:23:57 2007
+++ extra/lib/boost/PKGBUILD	Wed May 30 08:20:51 2007
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD,v 1.18 2007/05/30 11:23:57 jgc Exp $
+# $Id: PKGBUILD,v 1.19 2007/05/30 12:20:51 jgc Exp $
 # Maintainer: kevin <kevin at archlinux.org>
 # TU: Kritoke <kritoke at gamebox.net>
 # Contributor: Luca Roccia <little_rock at users.sourceforge.net>
  
 pkgname=boost
 pkgver=1.34.0
-pkgrel=1
+_boostver=1_34_0
+pkgrel=2
 pkgdesc="Boost provides free peer-reviewed portable C++ source libraries."
 arch=(i686 x86_64)
 url="http://boost.sourceforge.net/"
 depends=('python>=2.5' 'bzip2' 'zlib')
 #conflicts=('jam')
 #provides=('jam')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/${pkgname}_1_34_0.tar.gz
+source=(http://dl.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_boostver}.tar.gz
 	boost-atomicity.patch)
 license=('custom')
 md5sums=('9ac80f77a7009f9e72050cfe1e4b38ed' '7d92a530ba3f3504b375de755eb021d8')
  
 build() {
-  cd $startdir/src/${pkgname}_1_34_0
+  cd $startdir/src/${pkgname}_${_boostver}
   patch -Np0 -i ${startdir}/src/boost-atomicity.patch || return 1
 
+  export CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
   # build bjam
-  cd $startdir/src/${pkgname}_1_34_0/tools/jam/src
-  ./build.sh ${BOOST_TOOLSET} || return 1
+  cd $startdir/src/${pkgname}_${_boostver}/tools/jam/src
+  ./build.sh cc || return 1
 
   _bindir="bin.linuxx86"
   [ "$CARCH" = "x86_64" ] && _bindir="bin.linux"
@@ -32,13 +35,13 @@
   #(cd $startdir/pkg/usr/bin; ln -s bjam jam)
  
   # build bcp
-  cd $startdir/src/${pkgname}_1_34_0/tools/bcp
+  cd $startdir/src/${pkgname}_${_boostver}/tools/bcp
   ../jam/src/$_bindir/bjam
-  install -D -m755 $startdir/src/${pkgname}_1_34_0/dist/bin/bcp \
+  install -D -m755 $startdir/src/${pkgname}_${_boostver}/dist/bin/bcp \
                    $startdir/pkg/usr/bin/bcp
 
   # build libs
-  cd $startdir/src/${pkgname}_1_34_0
+  cd $startdir/src/${pkgname}_${_boostver}
   mkdir -p $startdir/pkg/usr
   # default "debug release <runtime-link>static/dynamic <threading>single/multi"
   # --layout=system removes the -gcc suffix from libraries and installs
@@ -51,13 +54,13 @@
             -sPYTHON_VERSION=2.5 \
             -sTOOLS=gcc \
             --layout=system \
-            install
+            install || return 1
 
   # build pyste
-  cd $startdir/src/${pkgname}_1_34_0/libs/python/pyste/install
+  cd $startdir/src/${pkgname}_${_boostver}/libs/python/pyste/install
   python setup.py install --root=$startdir/pkg
 
   # license
-  install -D -m644 $startdir/src/${pkgname}_1_34_0/LICENSE_1_0.txt \
+  install -D -m644 $startdir/src/${pkgname}_${_boostver}/LICENSE_1_0.txt \
                    $startdir/pkg/usr/share/licenses/$pkgname/LICENSE_1_0.txt
 }