diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 77d38f9..690c630 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -19,32 +19,39 @@ arch=('x86_64') license=('custom') makedepends=('icu' 'python' 'python-numpy' 'bzip2' 'zlib' 'openmpi' 'zstd' 'findutils') source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2 - ${pkgbase}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch) + ${pkgbase}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch + boost-1.75.0-boost-build-fix.patch) sha256sums=('953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb' - 'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee') + 'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee' + 'd4af93905816794668ff944117b7d4048a9ba1ea93ab3cd114c1f86fa7e8f693') b2sums=('ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6' - 'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3') + 'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3' + 'b9a24294084d621cbe2008d1eb41e6262e2750a4223a486f0f5c4fdfc99d6eb28e270ad192e071bbffd1ee92d7463f6a88e59ba94a325f92788a8ae0c99483e5') prepare() { cd ${pkgbase}_${_boostver} # https://github.com/boostorg/ublas/pull/97 patch -Np2 -i ../${pkgbase}-ublas-c++20-iterator.patch + # https://github.com/boostorg/build/issues/696 + patch -Np1 -i ../boost-1.75.0-boost-build-fix.patch } build() { export _stagedir="${srcdir}/stagedir" local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})" - cd ${pkgbase}_${_boostver} + cd ${pkgbase}_${_boostver}/tools/build + ./bootstrap.sh + ./b2 install --prefix="${_stagedir}" + + cd ../.. ./bootstrap.sh \ --with-toolset=gcc \ --with-icu \ --with-python=/usr/bin/python3 \ - install -Dm755 tools/build/src/engine/b2 "${_stagedir}"/bin/b2 - # Support for OpenMPI echo "using mpi ;" >> project-config.jam