tiledb: update to 2.26.0

This commit is contained in:
Theodore Tsirpanis
2024-10-28 12:35:19 +02:00
committed by GitHub
parent 9283e7cbf6
commit b6094a2948
4 changed files with 8 additions and 50 deletions
+4 -10
View File
@@ -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.25.0
github.setup TileDB-Inc TileDB 2.26.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 6e17574c88f6c64f65247a2326de44eda55cc08d \
sha256 edadfc63b419c605d37304236ca6de55a46a9905015e122e597b82075135d39e \
size 4222271
checksums rmd160 baf03651538a6341088c5eeec3c9811cc982f8c1 \
sha256 040fa23ccef23f05d96305b29332686062bd5d67e1d6e6d830f992261ffeda9d \
size 4214151
github.tarball_from archive
# Notice that 32-bit platforms are not supported by upstream, and there are reports elsewhere
@@ -74,11 +74,6 @@ if {[string match *gcc* ${configure.compiler}] && ${configure.build_arch} in [li
patch-libatomic-32-bit.diff
}
# Patch TileDB to find lz4 manually, because the lz4 package does not provide CMake configs.
# Updating the lz4 port is blocked on lz4 releasing a new version, with some official
# linkage-agnostic targets.
patchfiles-append lz4_fix.diff
compiler.cxx_standard 2020
# https://github.com/TileDB-Inc/TileDB/issues/4566
compiler.blacklist-append {clang < 1400}
@@ -96,7 +91,6 @@ configure.args-append \
-DTILEDB_GCS=OFF \
-DTILEDB_HDFS=OFF \
-DTILEDB_SERIALIZATION=OFF \
-DTILEDB_SUPERBUILD=OFF \
-DTILEDB_TESTS=OFF \
-DTILEDB_TOOLS=OFF \
-DTILEDB_VERBOSE=ON \
-26
View File
@@ -1,26 +0,0 @@
From e290ae2306b19e065b6580514eed7a53519d062b Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com>
Date: Fri, 31 May 2024 23:06:58 +0300
Subject: [PATCH] Skip finding the lz4 package.
Downstream packagers like Conda and MacPorts need to find lz4 manually, because the packages for lz4 in these environments do not provide CMake configs.
---
cmake/Modules/FindLZ4_EP.cmake | 5 -----
1 file changed, 5 deletions(-)
diff --git cmake/Modules/FindLZ4_EP.cmake cmake/Modules/FindLZ4_EP.cmake
index b044992998e..b2263217519 100644
--- cmake/Modules/FindLZ4_EP.cmake
+++ cmake/Modules/FindLZ4_EP.cmake
@@ -34,11 +34,6 @@
# Include some common helper functions.
include(TileDBCommon)
-if(TILEDB_VCPKG)
- find_package(lz4 REQUIRED)
- return()
-endif()
-
# First check for a static version in the EP prefix.
find_library(LZ4_LIBRARIES
NAMES
@@ -15,15 +15,16 @@ diff --git tiledb/api/c_api/enumeration/CMakeLists.txt tiledb/api/c_api/enumerat
index af077b988..78feda977 100644
--- tiledb/api/c_api/enumeration/CMakeLists.txt
+++ tiledb/api/c_api/enumeration/CMakeLists.txt
@@ -32,7 +32,7 @@ gather_sources(${SOURCES})
@@ -32,7 +32,7 @@
commence(object_library capi_enumeration_stub)
this_target_sources(enumeration_api.cc)
- this_target_link_libraries(export)
+ this_target_link_libraries(export atomic)
this_target_object_libraries(capi_buffer_stub constants)
this_target_object_libraries(capi_buffer_stub capi_string constants)
this_target_object_libraries(enumeration)
conclude(object_library)
diff --git tiledb/api/c_api/string/CMakeLists.txt tiledb/api/c_api/string/CMakeLists.txt
index 3ce1872d1..e8c8b3df4 100644
--- tiledb/api/c_api/string/CMakeLists.txt
+1 -12
View File
@@ -29,19 +29,8 @@
TILEDB_CORE_OBJECTS_ILIB
Catch2::Catch2
tiledb_test_support_lib
configuration_definitions
+ MacportsLegacySupport
)
target_link_libraries(tiledb_unit PRIVATE $<BUILD_INTERFACE:common>)
--- cmake/Modules/FindMagic_EP.cmake.orig 2023-04-26 09:28:54.000000000 +0800
+++ cmake/Modules/FindMagic_EP.cmake 2023-05-18 11:33:39.000000000 +0800
@@ -134,7 +134,7 @@
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- "-DCMAKE_C_FLAGS=${CFLAGS_DEF}"
+ "-DCMAKE_C_FLAGS=${CFLAGS_DEF} -I@PREFIX@/include/LegacySupport -Wl,-lMacportsLegacySupport"
-Dlibmagic_STATIC_LIB=ON
-DBUILD_MAGIC_MACOS_UNIVERSAL=$ENV{BUILD_MAGIC_MACOS_UNIVERSAL}
LOG_DOWNLOAD TRUE