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

[Jan de Groot]

    Date: Wednesday, May 30, 2007 @ 07:24:00
  Author: jgc
    Path: /home/cvs-extra/extra/lib/boost

   Added: boost-atomicity.patch (1.1)
Modified: PKGBUILD (1.17 -> 1.18)

upgpkg: boost 1.34.0-1
Fix includes for gcc 4.2


-----------------------+
 PKGBUILD              |    9 +++++----
 boost-atomicity.patch |   16 ++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)


Index: extra/lib/boost/PKGBUILD
diff -u extra/lib/boost/PKGBUILD:1.17 extra/lib/boost/PKGBUILD:1.18
--- extra/lib/boost/PKGBUILD:1.17	Sun May 20 07:33:59 2007
+++ extra/lib/boost/PKGBUILD	Wed May 30 07:23:57 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.17 2007/05/20 11:33:59 pierre Exp $
+# $Id: PKGBUILD,v 1.18 2007/05/30 11:23:57 jgc Exp $
 # Maintainer: kevin <kevin at archlinux.org>
 # TU: Kritoke <kritoke at gamebox.net>
 # Contributor: Luca Roccia <little_rock at users.sourceforge.net>
@@ -12,13 +12,14 @@
 depends=('python>=2.5' 'bzip2' 'zlib')
 #conflicts=('jam')
 #provides=('jam')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/${pkgname}_1_34_0.tar.gz	boost_1_33_1-ssize_t.patch)
+source=(http://dl.sourceforge.net/sourceforge/$pkgname/${pkgname}_1_34_0.tar.gz
+	boost-atomicity.patch)
 license=('custom')
-md5sums=('9ac80f77a7009f9e72050cfe1e4b38ed'
-         '55f8582cd0d55bf71bf724621eb07c6a')
+md5sums=('9ac80f77a7009f9e72050cfe1e4b38ed' '7d92a530ba3f3504b375de755eb021d8')
  
 build() {
   cd $startdir/src/${pkgname}_1_34_0
+  patch -Np0 -i ${startdir}/src/boost-atomicity.patch || return 1
 
   # build bjam
   cd $startdir/src/${pkgname}_1_34_0/tools/jam/src
Index: extra/lib/boost/boost-atomicity.patch
diff -u /dev/null extra/lib/boost/boost-atomicity.patch:1.1
--- /dev/null	Wed May 30 07:24:00 2007
+++ extra/lib/boost/boost-atomicity.patch	Wed May 30 07:24:00 2007
@@ -0,0 +1,16 @@
+diff -urN boost.org/detail/atomic_count_gcc.hpp boost/detail/atomic_count_gcc.hpp
+--- boost.org/detail/atomic_count_gcc.hpp	2005-04-02 11:37:53.000000000 +0000
++++ boost/detail/atomic_count_gcc.hpp	2007-04-24 19:03:25.516377811 +0000
+@@ -17,7 +17,11 @@
+ //  http://www.boost.org/LICENSE_1_0.txt)
+ //
+ 
+-#include <bits/atomicity.h>
++#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
++#include <ext/atomicity.h>
++#else
++#include <bits/atomicity.h>
++#endif
+ 
+ namespace boost
+ {