diff --git a/mingw-w64-rocksdb/0004-fix-generating-and-install-import-lib.patch b/mingw-w64-rocksdb/0004-fix-generating-and-install-import-lib.patch index fa3bbb31fc..d228d9961f 100644 --- a/mingw-w64-rocksdb/0004-fix-generating-and-install-import-lib.patch +++ b/mingw-w64-rocksdb/0004-fix-generating-and-install-import-lib.patch @@ -16,7 +16,7 @@ if(WIN32) set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES COMPILE_DEFINITIONS "ROCKSDB_DLL;ROCKSDB_LIBRARY_EXPORTS") -+ set_target_properties(${ROCKSDB_IMPORT_LIB} PROPERTIES ARCHIVE_OUTPUT_NAME "rocksdb") ++ set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES ARCHIVE_OUTPUT_NAME "rocksdb") if(MSVC) set_target_properties(${ROCKSDB_STATIC_LIB} PROPERTIES COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/${ROCKSDB_STATIC_LIB}.pdb") diff --git a/mingw-w64-rocksdb/PKGBUILD b/mingw-w64-rocksdb/PKGBUILD index 24fe2a0057..45a2a567bd 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=3 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" @@ -24,7 +25,7 @@ source=(${_realname}-${pkgver}.tar.gz::"https://github.com/facebook/${_realname} "0006-cmake-build.patch" "0007-mingw-fix-build-flags.patch") sha256sums=('c4d1397b58e4801b5fd7c3dd9175e6ae84541119cbebb739fe17d998f1829e81' - '4ac7ef7039284f8bed32123e91405e6fbb4af91e70d059cbc2c973152f575960' + '20a1f6f54a6dec3298f8f0331ad56a70ff2c6c240956b4e5d50c50253628599c' 'f0ce06542820a45eee74316f4b84a921f266032666a07e25284680ad1cc041da' 'e3ca227ef5751fe558135720ee911c9747fb77a6d6b84a2f4001ccff7c224ee1' '14ed48fde07d6165316e467fa13f908f00a7efc3449c67a1256ff37cb4c88039') @@ -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