From 6dd4dcc6dde08e56ac577dacba0a32a915ae4e55 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 21 Oct 2020 20:21:32 +0200 Subject: [PATCH] rocksdb: switch to ninja --- mingw-w64-rocksdb/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mingw-w64-rocksdb/PKGBUILD b/mingw-w64-rocksdb/PKGBUILD index 24fe2a0057..db9c9b40bc 100644 --- a/mingw-w64-rocksdb/PKGBUILD +++ b/mingw-w64-rocksdb/PKGBUILD @@ -4,7 +4,7 @@ _realname=rocksdb pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=6.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides an embeddable, persistent key-value store for fast storage (mingw-w64)" arch=('any') url="https://rocksdb.org/" @@ -16,6 +16,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-zstd") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-gcc") options=('staticlibs' 'strip') source=(${_realname}-${pkgver}.tar.gz::"https://github.com/facebook/${_realname}/archive/v${pkgver}.tar.gz" @@ -52,7 +53,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ + -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ -DWITH_ZLIB=ON \ @@ -66,12 +67,12 @@ build() { -DROCKSDB_INSTALL_ON_WINDOWS=ON \ ../${_realname}-${pkgver} - make + ninja } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR=${pkgdir} install + DESTDIR=${pkgdir} ninja install local WINPREFIX=$(cygpath -wm ${MINGW_PREFIX}) # Fix paths