aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-09-26 12:34:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-09-26 12:34:14 +0000
commite6486c1aab8161c332c9b31cbb79d15fa388c3ef (patch)
tree56428854138dc2cfdcf5e0b842c81220911d1145 /main
parent56f8faaef733e160aedf7dfd7b4c660bc1d0baa0 (diff)
downloadaports-e6486c1aab8161c332c9b31cbb79d15fa388c3ef.tar.bz2
aports-e6486c1aab8161c332c9b31cbb79d15fa388c3ef.tar.xz
main/boost: upgrade to 1.56.0
Diffstat (limited to 'main')
-rw-r--r--main/boost/APKBUILD17
-rw-r--r--main/boost/stdint.patch13
2 files changed, 7 insertions, 23 deletions
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index db6f0c5505..5206161d5e 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=boost
-pkgver=1.55.0
+pkgver=1.56.0
_x=${pkgver%%.*} # strip .y.z
_y=${pkgver%.*} # strip .z
@@ -35,7 +35,6 @@ $pkgname-wave
$pkgname-wserialization
"
source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$_ver.tar.gz
- stdint.patch
"
_builddir="$srcdir"/${pkgname}_${_ver}
@@ -72,11 +71,12 @@ _options="--user-config=\"$_builddir/user-config.jam\"
"
_boostarch=${CARCH/armhf/arm}
+_enginedir=tools/build/src/engine
build() {
msg "Building bjam"
export BOOST_ROOT="$_builddir"
- cd "$_builddir"/tools/build/v2/engine
+ cd "$_builddir"/$_enginedir
CC= ./build.sh cc || return 1
_bindir="$PWD/bin.linux$_boostarch"
_bjam="$_bindir"/bjam
@@ -93,7 +93,7 @@ build() {
package() {
cd "$_builddir"
export BOOST_ROOT="$_builddir"
- local _bindir="$_builddir"/tools/build/v2/engine/bin.linux${_boostarch}
+ local _bindir="$_builddir"/$_enginedir/bin.linux${_boostarch}
install -m755 -d "$pkgdir"/usr/bin
install -m755 ${_bindir}/bjam "$pkgdir"/usr/bin/bjam || return 1
install -m755 "$srcdir"/${pkgname}_${_ver}/dist/bin/bcp \
@@ -136,9 +136,6 @@ wave() { _mvlib wave; }
wserialization() { _mvlib wserialization; }
-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"
+md5sums="8c54705c424513fa2be0042696a3a162 boost_1_56_0.tar.gz"
+sha256sums="f53024506c3b3a6f96520054ec82a834772720908aed6050b30f4f56722e7701 boost_1_56_0.tar.gz"
+sha512sums="374f6c0edd303b3a5e74c50cac31997c1186b3e9f32c6ab1b1815cd002e7da041256eec7906a2d5aadaedf19cd1e6b0a4287734c8b8ee1a85b587a96fca1232f boost_1_56_0.tar.gz"
diff --git a/main/boost/stdint.patch b/main/boost/stdint.patch
deleted file mode 100644
index 65e838d3ad..0000000000
--- a/main/boost/stdint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./boost/atomic/atomic.hpp.orig 2013-04-23 11:44:45.556751918 +0000
-+++ ./boost/atomic/atomic.hpp 2013-04-23 11:45:44.944031100 +0000
-@@ -8,6 +8,10 @@
- // http://www.boost.org/LICENSE_1_0.txt)
-
- #include <cstddef>
-+extern "C" {
-+#include <stdint.h>
-+}
-+
- #include <boost/cstdint.hpp>
-
- #include <boost/memory_order.hpp>