diff --git a/mingw-w64-tl-expected/PKGBUILD b/mingw-w64-tl-expected/PKGBUILD index e282d5e2f9..aa08569876 100644 --- a/mingw-w64-tl-expected/PKGBUILD +++ b/mingw-w64-tl-expected/PKGBUILD @@ -3,8 +3,8 @@ _realname=tl-expected pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.0.0 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="C++11/14/17 std::expected with functional-style extensions (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -13,34 +13,35 @@ license=('custom:CC0') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") -source=("expected-v1.0.0.tar.gz::https://github.com/TartanLlama/expected/archive/v1.0.0.tar.gz") -sha256sums=("8f5124085a124113e75e3890b4e923e3a4de5b26a973b891b3deb40e19c03cee") - -prepare() { - mkdir "expected-$pkgver/build" -} +source=("expected-v${pkgver}.tar.gz::https://github.com/TartanLlama/expected/archive/v${pkgver}.tar.gz") +sha256sums=('1db357f46dd2b24447156aaf970c4c40a793ef12a8a9c2ad9e096d9801368df6') build() { - cd "expected-$pkgver/build" + mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"Ninja" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - .. + -DEXPECTED_BUILD_TESTS=OFF \ + -DEXPECTED_BUILD_PACKAGE=OFF \ + ../expected-${pkgver} ${MINGW_PREFIX}/bin/cmake --build ./ } check() { - cd "expected-$pkgver/build" + cd "build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/cmake -DEXPECTED_BUILD_TESTS=ON ../expected-${pkgver} + ${MINGW_PREFIX}/bin/cmake --build . ./tests } package() { - cd "expected-$pkgver/build" + cd "build-${MSYSTEM}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install - cd .. - install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/${_realname}/LICENSE" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + + install -Dm644 "${srcdir}"/expected-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/${_realname}/LICENSE" }