From bc4d7cc6d9f304cb9b67f2fce12ffce57759e74e Mon Sep 17 00:00:00 2001 From: "Tuan M. Hoang" Date: Fri, 17 Mar 2017 07:02:50 -0400 Subject: main/boost: add s390x support Reorder a little bit. Update mismatch sha512 sum. --- main/boost/APKBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'main') diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index 474399a3b4..d1bd2f0896 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -2,7 +2,7 @@ pkgname=boost pkgver=1.62.0 _pkgver="${pkgver//./_}" -pkgrel=3 +pkgrel=4 pkgdesc="Free peer-reviewed portable C++ source libraries" url="http://www.boost.org/" arch="all" @@ -62,6 +62,17 @@ prepare() { __EOF__ } +case "$CARCH" in + armhf|aarch64) _boostarch=arm ;; + ppc64*) _boostarch=ppc ;; + s390x) _boostarch=s390 ;; + *) _boostarch=$CARCH ;; +esac +_enginedir=tools/build/src/engine +_bjam="${builddir}/$_enginedir/bin.linux${_boostarch}/bjam" +[ "$_boostarch" = "s390" ] && _bjam="${builddir}/$_enginedir/bin.linux390/bjam" && \ + _options_s390="--without-context --without-coroutine --without-coroutine2" + _options="--user-config=\"$builddir/user-config.jam\" --prefix=\"$pkgdir/usr\" release @@ -76,22 +87,15 @@ _options="--user-config=\"$builddir/user-config.jam\" --layout=tagged -q -j${JOBS:-2} + ${_options_s390} " -case "$CARCH" in - armhf|aarch64) _boostarch=arm ;; - ppc64*) _boostarch=ppc ;; - *) _boostarch=$CARCH ;; -esac -_enginedir=tools/build/src/engine - build() { export BOOST_ROOT="$builddir" msg "Building bjam" cd "$builddir"/$_enginedir CC= ./build.sh cc || return 1 - local _bjam="$PWD/bin.linux$_boostarch/bjam" msg "Building bcp" cd "$builddir"/tools/bcp @@ -106,7 +110,7 @@ package() { export BOOST_ROOT="$builddir" cd "$builddir" - install -Dm755 $_enginedir/bin.linux${_boostarch}/bjam \ + install -Dm755 $_bjam \ "$pkgdir"/usr/bin/bjam || return 1 install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp || return 1 @@ -138,7 +142,7 @@ _pyversion() { $1 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' } -sha512sums="26f9bd25133e459e2e583cec7e0cbaf805de920a411dd1aa4e2b88091f6a6a9ea3642545da38fa3e7b8f44c336b8b909a4ce76db5502f7140fd62a1505e18e7c boost_1_62_0.tar.bz2 +sha512sums="5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be boost_1_62_0.tar.bz2 5804c344b5e5ece17811e744f1965c58840b6695a084dd09c23c9db380f3cbfbca201d6c595b5379bc12ff6f285794509799d28864df6037db6212c63adb2207 libressl.patch d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch -- cgit v1.2.3