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

Kevin Piche kevin at archlinux.org
Sat Sep 20 03:17:19 UTC 2008


    Date: Friday, September 19, 2008 @ 23:17:18
  Author: kevin
Revision: 12769

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

........
  r4060 | eric | 2008-07-02 20:10:22 -0400 (Wed, 02 Jul 2008) | 2 lines
  
  upgpkg: boost 1.35.0-1
      added patch to fix gcc 4.3 build problem on x86_64, fixed _bindir for x86_64
........
  r12768 | kevin | 2008-09-19 23:16:54 -0400 (Fri, 19 Sep 2008) | 1 line
  
  upgpkg: boost 1.36.0-1
........

Added:
  boost/repos/testing-i686/serialization_gcc43.patch
    (from rev 12768, boost/trunk/serialization_gcc43.patch)
Modified:
  boost/repos/testing-i686/	(properties)
  boost/repos/testing-i686/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 ++++++-----
 serialization_gcc43.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-20 03:16:54 UTC (rev 12768)
+++ testing-i686/PKGBUILD	2008-09-20 03:17:18 UTC (rev 12769)
@@ -4,27 +4,28 @@
 # Contributor: Luca Roccia <little_rock at users.sourceforge.net>
  
 pkgname=boost
-pkgver=1.35.0
-_boostver=1_35_0
+pkgver=1.36.0
+_boostver=1_36_0
 pkgrel=1
 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)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_boostver}.tar.gz serialization_gcc43.patch)
 license=('custom')
-md5sums=('a6b7d92c335c83e69a968a7a7926c933')
+md5sums=('550b9157a596f9095aaafd683c4bccf8')
  
 build() {
   cd $startdir/src/${pkgname}_${_boostver}
   export CFLAGS="${CFLAGS} -fno-strict-aliasing"
+#  patch -p5 < ../serialization_gcc43.patch || return 1
 
   # build bjam
   cd $startdir/src/${pkgname}_${_boostver}/tools/jam/src
   ./build.sh cc || return 1
 
   _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linux"
+  [ "${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

Copied: boost/repos/testing-i686/serialization_gcc43.patch (from rev 12768, boost/trunk/serialization_gcc43.patch)
===================================================================
--- testing-i686/serialization_gcc43.patch	                        (rev 0)
+++ testing-i686/serialization_gcc43.patch	2008-09-20 03:17:18 UTC (rev 12769)
@@ -0,0 +1,44 @@
+Index: /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp
+===================================================================
+--- /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Revision 43953)
++++ /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Arbeitskopie)
+@@ -17,6 +17,7 @@
+ //  See http://www.boost.org for updates, documentation, and revision history.
+ 
+ #include <cstddef> // std::size_t
++#include <climits> // ULONG_MAX
+ #include <boost/config.hpp>
+ 
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+@@ -38,6 +39,9 @@
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
++#ifndef ULONG_MAX
++# error "ULONG_MAX is not defined"
++#endif
+ #if defined(BOOST_NO_INT64_T) \
+     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+ #   define BOOST_NO_INTRINSIC_INT64_T
+Index: /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp
+===================================================================
+--- /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Revision 43953)
++++ /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Arbeitskopie)
+@@ -18,6 +18,7 @@
+ 
+ #include <cstddef> // size_t
+ #include <string>
++#include <climits> // ULONG_MAX
+ 
+ #include <boost/config.hpp>
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+@@ -37,6 +38,9 @@
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
++#ifndef ULONG_MAX
++# error "ULONG_MAX is not defined"
++#endif
+ #if defined(BOOST_NO_INT64_T) \
+     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
+ #   define BOOST_NO_INTRINSIC_INT64_T




More information about the arch-commits mailing list