tiledb: update to 2.23.0

barracuda156 · May 10, 2024 · fc7b324 · fc7b324
1 parent d038243
commit fc7b324
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/databases/tiledb/Portfile b/databases/tiledb/Portfile
@@ -13,7 +13,7 @@ legacysupport.newest_darwin_requires_legacy 19
 # See discussion in: https://github.com/macports/macports-ports/pull/19686
 legacysupport.use_mp_libcxx yes
 
-github.setup        TileDB-Inc TileDB 2.22.0
+github.setup        TileDB-Inc TileDB 2.23.0
 name                tiledb
 revision            0
 categories          databases
@@ -22,9 +22,9 @@ maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 description         The universal storage engine
 long_description    {*}${description}
 homepage            https://tiledb.com
-checksums           rmd160  3ed88a6d272c52f37acf3b0599dd66a74a51d8b8 \
-                    sha256  55848552a169a029d2b73e14f4efc846117f41e42f742402f774290d12f410be \
-                    size    4424592
+checksums           rmd160  3b9fbc29c9381a94291f434071d1f34877c889ab \
+                    sha256  3a7db2094eb5f01d1fdd8c0e74912cbf78f9f7658f520e84f2c6f647f404ba8c \
+                    size    4443024
 github.tarball_from archive
 
 # Notice that 32-bit platforms are not supported by upstream, and there are reports elsewhere
@@ -70,16 +70,17 @@ if {${os.platform} eq "darwin" && ${os.major} < 20} {
     }
 }
 
-# Verify if still broken in the next release. Relevant only for build with +tests:
-# https://github.com/TileDB-Inc/TileDB/issues/4590
-patchfiles-append   patch-unit_capi_error_tree.cc-temporary-fix.diff
-
 # Can be rewritten unconditionally, but no point in making a patch more complex:
 if {[string match *gcc* ${configure.compiler}] && ${configure.build_arch} in [list arm i386 ppc]} {
     patchfiles-append \
                     patch-libatomic-32-bit.diff
 }
 
+# Upstream introduced an undesirable forcing of VCPKG.
+# https://github.com/TileDB-Inc/TileDB/issues/4960
+# We do not want that, it does not work correctly and totally unneeded anyway.
+patchfiles-append   patch-do-not-force-VCPKG.diff
+
 compiler.cxx_standard       2020
 # https://github.com/TileDB-Inc/TileDB/issues/4566
 compiler.blacklist-append   {clang < 1400}

diff --git a/databases/tiledb/files/patch-do-not-force-VCPKG.diff b/databases/tiledb/files/patch-do-not-force-VCPKG.diff
@@ -0,0 +1,22 @@
+--- cmake/Options/BuildOptions.cmake	2024-05-03 00:58:42.000000000 +0800
++++ cmake/Options/BuildOptions.cmake	2024-05-10 03:13:43.000000000 +0800
+@@ -8,7 +8,7 @@
+ include(CMakeDependentOption)
+
+ option(TILEDB_SUPERBUILD "If true, perform a superbuild (builds all missing dependencies)." ON)
+-option(TILEDB_VCPKG "If true, use vcpkg to download and build dependencies." ON)
++option(TILEDB_VCPKG "If true, use vcpkg to download and build dependencies." OFF)
+ cmake_dependent_option(TILEDB_FORCE_ALL_DEPS "If true, force superbuild to download and build all dependencies, even those installed on the system." OFF "NOT TILEDB_VCPKG" OFF)
+ option(TILEDB_SANITIZER "Sets the sanitizers to use. Only address is currently supported." "")
+ option(TILEDB_VCPKG_BASE_TRIPLET "Sets the base vcpkg triplet when building with sanitizers." "")
+@@ -48,10 +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")
+   set(TILEDB_ASSERTIONS TRUE)