[arch-commits] Commit in boost/repos (3 files)

[Kevin Piche]

    Date: Wednesday, October 1, 2008 @ 23:09:29
  Author: kevin
Revision: 14045

Merged revisions 12803,14044 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/boost/trunk

........
  r12803 | eric | 2008-09-21 00:28:27 -0400 (Sun, 21 Sep 2008) | 2 lines
  
  upgpkg: boost 1.36.0-1
      fixed md5sums
........
  r14044 | kevin | 2008-10-01 23:08:57 -0400 (Wed, 01 Oct 2008) | 2 lines
  
  upgpkg: boost 1.36.0-2
      Added patch 0001-date_time-gcc-4.3-fix.patch
........

Added:
  boost/repos/testing-i686/0001-date_time-gcc-4.3-fix.patch
    (from rev 14044, boost/trunk/0001-date_time-gcc-4.3-fix.patch)
Modified:
  boost/repos/testing-i686/	(properties)
  boost/repos/testing-i686/PKGBUILD

----------------------------------+
 0001-date_time-gcc-4.3-fix.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                         |   36 ++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 18 deletions(-)


Property changes on: boost/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /boost/trunk:1-12768
   + /boost/trunk:1-14044

Copied: boost/repos/testing-i686/0001-date_time-gcc-4.3-fix.patch (from rev 14044, boost/trunk/0001-date_time-gcc-4.3-fix.patch)
===================================================================
--- testing-i686/0001-date_time-gcc-4.3-fix.patch	                        (rev 0)
+++ testing-i686/0001-date_time-gcc-4.3-fix.patch	2008-10-02 03:09:29 UTC (rev 14045)
@@ -0,0 +1,25 @@
+From 88f7023cc36d82133cfa0e705531a9d73feb4686 Mon Sep 17 00:00:00 2001
+From: Tim Blechmann <tim at klingt.org>
+Date: Sat, 2 Feb 2008 17:22:58 +0100
+Subject: [PATCH] date_time: gcc-4.3 fix
+
+---
+ boost/date_time/tz_db_base.hpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/boost/date_time/tz_db_base.hpp b/boost/date_time/tz_db_base.hpp
+index b9c0a8a..03f748e 100644
+--- a/boost/date_time/tz_db_base.hpp
++++ b/boost/date_time/tz_db_base.hpp
+@@ -158,7 +158,7 @@ namespace boost {
+       typedef typename time_zone_type::base_type time_zone_base_type;
+       typedef typename time_zone_type::time_duration_type time_duration_type;
+       typedef time_zone_names_base<char_type> time_zone_names;
+-      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
++      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+       typedef std::basic_string<char_type> string_type;
+ 
+       //! Constructs an empty database
+-- 
+1.5.3.8
+

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-10-02 03:08:57 UTC (rev 14044)
+++ testing-i686/PKGBUILD	2008-10-02 03:09:29 UTC (rev 14045)
@@ -6,45 +6,45 @@
 pkgname=boost
 pkgver=1.36.0
 _boostver=1_36_0
-pkgrel=1
+pkgrel=2
 pkgdesc="Boost provides free peer-reviewed portable C++ source libraries."
 arch=(i686 x86_64)
 url="http://www.boost.org/"
 depends=('python>=2.5' 'bzip2' 'zlib')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_boostver}.tar.gz serialization_gcc43.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz 0001-date_time-gcc-4.3-fix.patch)
 license=('custom')
-md5sums=('550b9157a596f9095aaafd683c4bccf8')
+md5sums=('550b9157a596f9095aaafd683c4bccf8' 'd7f821056540ef08eb1d5ebd5ed017f1')
  
 build() {
-  cd $startdir/src/${pkgname}_${_boostver}
+  cd ${srcdir}/${pkgname}_${_boostver}
   export CFLAGS="${CFLAGS} -fno-strict-aliasing"
-#  patch -p5 < ../serialization_gcc43.patch || return 1
+  patch -Np1 -i ${srcdir}/0001-date_time-gcc-4.3-fix.patch || return 1
 
   # build bjam
-  cd $startdir/src/${pkgname}_${_boostver}/tools/jam/src
+  cd ${srcdir}/${pkgname}_${_boostver}/tools/jam/src
   ./build.sh cc || return 1
 
   _bindir="bin.linuxx86"
   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
 
-  install -m755 -d ${startdir}/pkg/usr/bin
-  install -m755 ${_bindir}/bjam ${startdir}/pkg/usr/bin/bjam || return 1
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 ${_bindir}/bjam ${pkgdir}/usr/bin/bjam || return 1
  
   # build bcp
-  cd ${startdir}/src/${pkgname}_${_boostver}/tools/bcp
+  cd ${srcdir}/${pkgname}_${_boostver}/tools/bcp
   ../jam/src/${_bindir}/bjam || return 1
-  install -m755 ${startdir}/src/${pkgname}_${_boostver}/dist/bin/bcp \
-                   ${startdir}/pkg/usr/bin/bcp || return 1
+  install -m755 ${srcdir}/${pkgname}_${_boostver}/dist/bin/bcp \
+                ${pkgdir}/usr/bin/bcp || return 1
 
   # build libs
-  cd ${startdir}/src/${pkgname}_${_boostver}
+  cd ${srcdir}/${pkgname}_${_boostver}
   # default "debug release <runtime-link>static/dynamic <threading>single/multi"
   # --layout=system removes the -gcc suffix from libraries and installs
   # includes in /usr/include/boost.
   ./tools/jam/src/${_bindir}/bjam \
             release debug-symbols=off threading=single,multi \
 			runtime-link=shared link=shared,static \
-            --prefix=${startdir}/pkg/usr \
+            --prefix=${pkgdir}/usr \
             -sPYTHON_ROOT=/usr \
             -sPYTHON_VERSION=2.5 \
             -sTOOLS=gcc \
@@ -52,11 +52,11 @@
             install || return 1
 
   # build pyste
-  cd ${startdir}/src/${pkgname}_${_boostver}/libs/python/pyste/install
-  python setup.py install --root=${startdir}/pkg || return 1
+  cd ${srcdir}/${pkgname}_${_boostver}/libs/python/pyste/install
+  python setup.py install --root=${pkgdir} || return 1
 
   # license
-  install -m755 -d ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 ${startdir}/src/${pkgname}_${_boostver}/LICENSE_1_0.txt \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/ || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 ${srcdir}/${pkgname}_${_boostver}/LICENSE_1_0.txt \
+                ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }