tiledb: update to 2.23.0

msys2 · May 18, 2024 · 92d9741 · 92d9741
1 parent e688657
commit 92d9741
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/mingw-w64-tiledb/001-do-not-use-vcpkg.patch b/mingw-w64-tiledb/001-do-not-use-vcpkg.patch
@@ -0,0 +1,12 @@
+--- a/cmake/Options/BuildOptions.cmake
++++ b/cmake/Options/BuildOptions.cmake
+@@ -48,9 +48,6 @@
+   endif()
+ endif()
+
+-if (NOT TILEDB_VCPKG)
+-  message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported.")
+-endif()
+
+ # enable assertions by default for debug builds
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/mingw-w64-tiledb/002-enable-soversion.patch b/mingw-w64-tiledb/002-enable-soversion.patch
@@ -0,0 +1,11 @@
+--- a/tiledb/CMakeLists.txt
++++ b/tiledb/CMakeLists.txt
+@@ -862,7 +862,7 @@
+     )
+ endif()
+
+-if (TILEDB_VERSION AND CMAKE_SYSTEM_NAME MATCHES "Linux")
++if (NOT MSVC)
+   set_target_properties(tiledb
+     PROPERTIES
+       SOVERSION "${TILEDB_VERSION_MAJOR}.${TILEDB_VERSION_MINOR}")
diff --git a/mingw-w64-tiledb/PKGBUILD b/mingw-w64-tiledb/PKGBUILD
@@ -3,16 +3,16 @@
 _realname=tiledb
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.20.1
+pkgver=2.23.0
 pkgrel=1
 pkgdesc="Storage management library for sparse and dense array data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://tiledb.com/"
 msys2_references=(
   'aur: tiledb'
 )
 msys2_repository_url='https://github.com/TileDB-Inc/TileDB/'
-url="https://tiledb.com/"
 license=("spdx:MIT")
 depends=($([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-aws-sdk-cpp")
          "${MINGW_PACKAGE_PREFIX}-lz4"
@@ -28,13 +28,21 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-catch"
              "${MINGW_PACKAGE_PREFIX}-curl")
-source=("https://github.com/TileDB-Inc/TileDB/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('d9d52de7eef25c9e358f0dd6e696dc11a08d5b4d6c4ede88f11afffd32ec31c2')
+source=("https://github.com/TileDB-Inc/TileDB/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+        "001-do-not-use-vcpkg.patch"
+        "002-enable-soversion.patch")
+sha256sums=('3a7db2094eb5f01d1fdd8c0e74912cbf78f9f7658f520e84f2c6f647f404ba8c'
+            '6267519ebe64f531f873b1adfd74c46292fbd98bfb1c49a3d2bc84abfd78d549'
+            '845ccd7b2a73dbce6ab51fa8699f5c3388468e4fe68aa07ae9c1ef51b16edd43')
 noextract=(${_realname}-${pkgver}.tar.gz)
 
 prepare() {
   echo "Extracting ${_realname}-${pkgver}.tar.gz ..."
   tar -xzf ${srcdir}/${_realname}-${pkgver}.tar.gz || true
+
+  cd ${_realname}-${pkgver}
+  patch -p1 -i "${srcdir}"/001-do-not-use-vcpkg.patch
+  patch -p1 -i "${srcdir}"/002-enable-soversion.patch
 }
 
 build() {
@@ -54,11 +62,13 @@ build() {
     CXXFLAGS+=" -Wno-c++11-narrowing"
   fi
 
+  TILEDB_DISABLE_AUTO_VCPKG=0 \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -Wno-dev \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
     "${_extra_config[@]}" \
     -DTILEDB_STATIC=OFF \
     -DTILEDB_WERROR=OFF \