From 090fe2377abcbae9fa1db896db0758d17671a9ec Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 1 Sep 2021 18:51:07 +0530 Subject: [PATCH] blosc: Use Ninja, add correct snappy option --- mingw-w64-blosc/PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mingw-w64-blosc/PKGBUILD b/mingw-w64-blosc/PKGBUILD index e90e9f624d..73f4b047e2 100644 --- a/mingw-w64-blosc/PKGBUILD +++ b/mingw-w64-blosc/PKGBUILD @@ -5,7 +5,7 @@ _srcname=c-blosc pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.21.0 -pkgrel=1 +pkgrel=2 pkgdesc="A blocking, shuffling and loss-less compression library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -15,7 +15,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-snappy" "${MINGW_PACKAGE_PREFIX}-zstd" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-lz4") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") options=('strip' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Blosc/c-blosc/archive/v${pkgver}.tar.gz" 01-build-fix.patch) @@ -32,24 +33,24 @@ build() { mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - ${MINGW_PREFIX}/bin/cmake \ - -G'MSYS Makefiles' \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G'Ninja' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE="Release" \ -DBUILD_SHARED_LIBS="ON" \ + -DDEACTIVATE_SNAPPY="OFF" \ -DPREFER_EXTERNAL_LZ4="ON" \ -DPREFER_EXTERNAL_ZLIB="ON" \ - -DPREFER_EXTERNAL_SNAPPY="ON" \ -DPREFER_EXTERNAL_ZSTD="ON" \ -DBUILD_TESTS="OFF" \ ../${_srcname}-${pkgver} - make + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } package() { cd "${srcdir}"/build-${CARCH} - make install DESTDIR="${pkgdir}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install # License install -Dm644 ${srcdir}/${_srcname}-${pkgver}/LICENSES/BLOSC.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE