diff options
| author | Christian Kampka <christian@kampka.net> | 2015-11-03 10:37:36 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-05 13:37:25 +0000 |
| commit | b3e387abc11beb69432143238b5db04c39d2be87 (patch) | |
| tree | 7bbda8c0a2e55b5128b380bbd1f05f0a5c1f4c17 | |
| parent | 91f325ae3df6b12513246dc1f02db56f67386312 (diff) | |
main/boost: new upstream version 1.59.0, build with python3 support
| -rw-r--r-- | main/boost/0001-fix-condition-for-make_setter-overload.patch | 25 | ||||
| -rw-r--r-- | main/boost/APKBUILD | 28 |
2 files changed, 45 insertions, 8 deletions
diff --git a/main/boost/0001-fix-condition-for-make_setter-overload.patch b/main/boost/0001-fix-condition-for-make_setter-overload.patch new file mode 100644 index 00000000000..aa6fa07684f --- /dev/null +++ b/main/boost/0001-fix-condition-for-make_setter-overload.patch @@ -0,0 +1,25 @@ +From f410fbd64d887e2a8824f968b0533588489b5430 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Wed, 2 Sep 2015 13:02:12 +0100 +Subject: [PATCH] Python: Fix condition for make_setter overload. + +This fixes the regression caused by 42e7d7b. + +Fixes #39 +--- + include/boost/python/data_members.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boost/python/data_members.hpp b/boost/python/data_members.hpp +index 139bde3..5d3309c 100644 +--- a/boost/python/data_members.hpp ++++ b/boost/python/data_members.hpp +@@ -305,7 +305,7 @@ inline object make_setter(D& x) + return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0); + } + +-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 238) ++# if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238) + template <class D> + inline object make_setter(D const& x) + { diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index c393344290c..80196a4e76c 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=boost -pkgver=1.58.0 +pkgver=1.59.0 _x=${pkgver%%.*} # strip .y.z _y=${pkgver%.*} # strip .z @@ -8,14 +8,14 @@ _y=${_y#*.} # strip x. _z=${pkgver##*.} # strip x.y. _ver=${_x}_${_y}_${_z} -pkgrel=2 +pkgrel=0 pkgdesc="Free peer-reviewed portable C++ source libraries" url="http://www.boost.org/" arch="all" license="custom" depends= depends_dev="linux-headers" -makedepends="$depends_dev python-dev>=2.6 flex bison bzip2-dev zlib-dev" +makedepends="$depends_dev python-dev>=2.6 python3-dev flex bison bzip2-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-date_time $pkgname-filesystem @@ -24,6 +24,7 @@ $pkgname-iostreams $pkgname-math $pkgname-prg_exec_monitor $pkgname-program_options +$pkgname-python3:py3 $pkgname-python:py $pkgname-random $pkgname-regex @@ -36,6 +37,7 @@ $pkgname-wave $pkgname-wserialization " source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$_ver.tar.gz + 0001-fix-condition-for-make_setter-overload.patch " _builddir="$srcdir"/${pkgname}_${_ver} @@ -47,10 +49,15 @@ prepare() { esac done + PY2_VERSION=$(python -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') + + PY3_VERSION=$(python3 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') + # create user-config.jam cat > user-config.jam <<__EOF__ using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; +using python : ${PY3_VERSION} : /usr/bin/python3 : /usr/include/python${PY3_VERSION}m : /usr/lib ; __EOF__ } @@ -64,7 +71,7 @@ _options="--user-config=\"$_builddir/user-config.jam\" link=shared,static cflags=-fno-strict-aliasing -sPYTHON_ROOT=/usr - -sPYTHON_VERSION=2.6 + -sPYTHON_VERSION=${PY2_VERSION} -sTOOLS=gcc --layout=tagged -q @@ -114,6 +121,7 @@ package() { _mvlib() { pkgdesc="Boost $1 library" + [ -n "$2" ] && depends="$depends $2" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libboost_$1* "$subpkgdir"/usr/lib/ } @@ -125,7 +133,8 @@ iostreams() { _mvlib iostreams; } math() { _mvlib math; } prg_exec_monitor() { _mvlib prg_exec_monitor; } program_options() { _mvlib program_options; } -py() { _mvlib python; } +py3() { _mvlib python3 python3; } +py() { _mvlib python python; } random() { _mvlib random; } regex() { _mvlib regex; } serialization() { _mvlib serialization; } @@ -137,6 +146,9 @@ wave() { _mvlib wave; } wserialization() { _mvlib wserialization; } -md5sums="5a5d5614d9a07672e1ab2a250b5defc5 boost_1_58_0.tar.gz" -sha256sums="a004d9b3fa95e956383693b86fce1b68805a6f71c2e68944fa813de0fb8c8102 boost_1_58_0.tar.gz" -sha512sums="b49c6e6d2eb87bf08a45ef84c3dce2a86501fbf00012669e433812b936631210bc42dc3810c17bc0dd399eb8e71b55fe51c12c41dad8fdd803b893234de01245 boost_1_58_0.tar.gz" +md5sums="51528a0e3b33d9e10aaa311d9eb451e3 boost_1_59_0.tar.gz +2bf0efa72bfcf98681c5e3d8b2cfd2a8 0001-fix-condition-for-make_setter-overload.patch" +sha256sums="47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac boost_1_59_0.tar.gz +32adf03897e3a2bddfa1ae82034295b125dbe3f191360e6bfbccdc421b9980fa 0001-fix-condition-for-make_setter-overload.patch" +sha512sums="05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae boost_1_59_0.tar.gz +7076b8151762be886f1ae8587d4fec88c48b5d47b1a2b092a09b440577b65038ac6fdfb499ffed8c2a838785ccb9955135ff1a8f0c51070c04fb26e4d9a6cfdf 0001-fix-condition-for-make_setter-overload.patch" |