diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index 108c6f3bb8..c323129a7e 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -1,18 +1,14 @@ # Maintainer: Alexey Pavlov -if [[ "${MINGW_PREFIX}" =~ /clang.* ]] ; then - # _toolset=clang creates dlls names without the `lib' prefix - _toolset=gcc -else - _toolset=gcc -fi +# mingw logic lives in gcc.jam, so we always need to use the 'gcc' toolset +_toolset=gcc _realname=boost pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.78.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -24,7 +20,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-xz" "${MINGW_PACKAGE_PREFIX}-zstd" "${MINGW_PACKAGE_PREFIX}-zlib") +optdepends=("${MINGW_PACKAGE_PREFIX}-python: For Boost.Python" + "${MINGW_PACKAGE_PREFIX}-python-numpy: For Boost.Python (NumPy)") makedepends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-cc" "lndir") options=('strip' 'buildflags' 'staticlibs') @@ -165,9 +164,14 @@ build() { local _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") echo "using python : ${_pyver} : ${PREFIX_DEPS}/bin/python.exe : ${PREFIX_DEPS}/include/python${_pyver} : ${PREFIX_DEPS}/lib/python${_pyver}/config-${_pyver} ;" >> ./tools/build/src/user-config.jam - #echo "using gcc : : ${PREFIX_DEPS}/bin/g++.exe : ${PREFIX_DEPS}/bin/windres.exe ;" >> ./tools/build/src/user-config.jam + # configure b2 to use c++ rather than g++, as the latter no longer exists in + # clang prefixes + echo "using gcc : : ${PREFIX_DEPS}/bin/c++.exe ;" >> ./tools/build/src/user-config.jam - ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} --with-toolset=$_toolset + ./tools/build/src/engine/build.sh --cxx="${CXX}" gcc + cp ./tools/build/src/engine/b2 . + + ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} --with-toolset=$_toolset --with-bjam="$(pwd)/b2" setb2args ./b2 $b2args -j$(nproc)