diff options
| author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-02-08 15:52:19 +0100 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-02-08 15:52:19 +0100 |
| commit | 1c8351028000d5f1489dea2c59f14454a4155ad7 (patch) | |
| tree | a18451bb5f59d6179272a516370860d6ec02ff25 | |
| parent | aed3ff03118bc9929395d647c52d54e6908c941e (diff) | |
| download | aports-1c8351028000d5f1489dea2c59f14454a4155ad7.tar.bz2 aports-1c8351028000d5f1489dea2c59f14454a4155ad7.tar.xz | |
main/boost: upgrade to 1.55.0
| -rw-r--r-- | main/boost/APKBUILD | 20 | ||||
| -rw-r--r-- | main/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch | 35 |
2 files changed, 8 insertions, 47 deletions
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index fe41d5de3e..db6f0c5505 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=boost -pkgver=1.54.0 +pkgver=1.55.0 _x=${pkgver%%.*} # strip .y.z _y=${pkgver%.*} # strip .z @@ -8,7 +8,7 @@ _y=${_y#*.} # strip x. _z=${pkgver##*.} # strip x.y. _ver=${_x}_${_y}_${_z} -pkgrel=1 +pkgrel=0 pkgdesc="Free peer-reviewed portable C++ source libraries" url="http://www.boost.org/" arch="all" @@ -36,7 +36,6 @@ $pkgname-wserialization " source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$_ver.tar.gz stdint.patch - boost-1.54.0-Fix-macro-for-int128-detection.patch " _builddir="$srcdir"/${pkgname}_${_ver} @@ -137,12 +136,9 @@ wave() { _mvlib wave; } wserialization() { _mvlib wserialization; } -md5sums="efbfbff5a85a9330951f243d0a46e4b9 boost_1_54_0.tar.gz -44d1879459159367448967a2c43c36d1 stdint.patch -0eede5cba9c00f48ba197f993522882d boost-1.54.0-Fix-macro-for-int128-detection.patch" -sha256sums="412d003299e72555e1e1f62f51d3b07eca2a1911e27c442ee1c08167826ef9e2 boost_1_54_0.tar.gz -b48f6ba5ffbc04c88dedb6b6639d2870a8f0901693d762f5c8d2e912d8ab47a6 stdint.patch -b5f17c465f6fc442e6d7507aeb281551b19a00030a6c6e4df362b26c7511ea46 boost-1.54.0-Fix-macro-for-int128-detection.patch" -sha512sums="c2c56a50828d14d7eb34bb309702e232dbe2afa4ed6837a0e5af16f553e563b91f65a98413f5458f09d5899e42754277ce0d2556a642e9aed77eaa3bc2a28b36 boost_1_54_0.tar.gz -b964488c9c74d89a55480b3a0078d4e7a19df91c9a7ba9ea2695142b54335191a3c0fbb004893c03b498bc270680403e1ba3681eb94ef4407a70f0727aa66c0a stdint.patch -c627b189cf6d4b5d9efa60b204b5b85bffd2987cbb8727844b490824456830f674e4b97cca7518ad310c9b3855ec16af493fa02a7a8d9f2d5e9c9090c9f2b0c3 boost-1.54.0-Fix-macro-for-int128-detection.patch" +md5sums="93780777cfbf999a600f62883bd54b17 boost_1_55_0.tar.gz +44d1879459159367448967a2c43c36d1 stdint.patch" +sha256sums="19c4305cd6669f2216260258802a7abc73c1624758294b2cad209d45cc13a767 boost_1_55_0.tar.gz +b48f6ba5ffbc04c88dedb6b6639d2870a8f0901693d762f5c8d2e912d8ab47a6 stdint.patch" +sha512sums="71a64f2ed495f639ace2aba2b0623d372edfe18ccbff5211ed56dce05a726b5d4eb7efd7fc77bfdf070131ffa3db764a90049c819f5c1b0bda287816a333367e boost_1_55_0.tar.gz +b964488c9c74d89a55480b3a0078d4e7a19df91c9a7ba9ea2695142b54335191a3c0fbb004893c03b498bc270680403e1ba3681eb94ef4407a70f0727aa66c0a stdint.patch" diff --git a/main/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch b/main/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch deleted file mode 100644 index e3e22ec4df..0000000000 --- a/main/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: a/boost/lexical_cast.hpp
-===================================================================
---- a/boost/lexical_cast.hpp (revision 84136)
-+++ b/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: a/libs/conversion/test/lexical_cast_integral_types_test.cpp
-===================================================================
---- a/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 83717)
-+++ b/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);
|