[arch-commits] Commit in boost/trunk (2 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Mon Jul 8 07:30:51 UTC 2013
Date: Monday, July 8, 2013 @ 09:30:51
Author: bpiotrowski
Revision: 189778
upgpkg: boost 1.54.0-2
- add patch to fix int128 detection (FS#36061)
Added:
boost/trunk/boost-1.54.0-Fix-macro-for-int128-detection.patch
Modified:
boost/trunk/PKGBUILD
---------------------------------------------------+
PKGBUILD | 10 ++++-
boost-1.54.0-Fix-macro-for-int128-detection.patch | 35 ++++++++++++++++++++
2 files changed, 42 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-08 07:06:15 UTC (rev 189777)
+++ PKGBUILD 2013-07-08 07:30:51 UTC (rev 189778)
@@ -10,15 +10,17 @@
pkgname=('boost-libs' 'boost')
pkgver=1.54.0
_boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
url="http://www.boost.org/"
arch=('i686' 'x86_64')
license=('custom')
makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
- boost-1.53.0-python3.patch)
+ boost-1.53.0-python3.patch
+ boost-1.54.0-Fix-macro-for-int128-detection.patch)
sha1sums=('069501636097d3f40ddfd996d29748bb23591c53'
- '34026072a7cb2534164f20e77bb71a5c75093307')
+ '34026072a7cb2534164f20e77bb71a5c75093307'
+ 'bf5177694ab8a0df6bc13aa47b05727c40febebb')
build() {
@@ -27,6 +29,8 @@
cd "${srcdir}/${pkgbase}_${_boostver}"
+ patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch
+
# Fix build errors with python 3
sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
patch -Np1 -i ../boost-1.53.0-python3.patch
Added: boost-1.54.0-Fix-macro-for-int128-detection.patch
===================================================================
--- boost-1.54.0-Fix-macro-for-int128-detection.patch (rev 0)
+++ boost-1.54.0-Fix-macro-for-int128-detection.patch 2013-07-08 07:30:51 UTC (rev 189778)
@@ -0,0 +1,35 @@
+Index: /trunk/boost/lexical_cast.hpp
+===================================================================
+--- /trunk/boost/lexical_cast.hpp (revision 84136)
++++ /trunk/boost/lexical_cast.hpp (revision 84965)
+@@ -70,8 +70,8 @@
+ #endif
+
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+-
+
+ namespace boost
+Index: /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp
+===================================================================
+--- /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 83717)
++++ /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 84965)
+@@ -49,5 +49,5 @@
+ #endif
+
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+@@ -445,6 +445,6 @@
+
+ // Overflow test case from David W. Birdsall
+- std::string must_owerflow_str = "160000000000000000000";
+- std::string must_owerflow_negative_str = "-160000000000000000000";
++ std::string must_owerflow_str = (sizeof(T) < 16 ? "160000000000000000000" : "1600000000000000000000000000000000000000");
++ std::string must_owerflow_negative_str = (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
+ for (int i = 0; i < 15; ++i) {
+ BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
More information about the arch-commits
mailing list