libtiledb: Bump to 2.14.0

This commit is contained in:
Tee KOBAYASHI
2023-02-01 07:38:24 +09:00
committed by xtkoba
parent 6e2e845cdc
commit 9d64ce217b
6 changed files with 55 additions and 44 deletions
+3 -2
View File
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tiledb.com/
TERMUX_PKG_DESCRIPTION="A powerful engine for storing and accessing dense and sparse multi-dimensional arrays"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.12.2
TERMUX_PKG_VERSION=2.14.0
TERMUX_PKG_SRCURL=https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=0868b226444b3eb81ac690d2208e0120e8e37cfcc4d27fc07d69c68606f0b359
TERMUX_PKG_SHA256=e161d7988fa6e4e2e6238e25cbc0941bb2ed5eb375257d96ad7ce518864cd7f4
TERMUX_PKG_DEPENDS="ca-certificates, file, libbz2, libc++, liblz4, libspdlog, openssl, zlib, zstd"
TERMUX_PKG_BUILD_DEPENDS="clipp, fmt"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -12,6 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DTILEDB_WERROR=OFF
-DTILEDB_STATS=OFF
-DTILEDB_TESTS=OFF
-DTILEDB_WEBP=OFF
-DHAVE_AVX2_EXITCODE=1
-DHAVE_AVX2_EXITCODE__TRYRUN_OUTPUT=
-DTILEDB_LIBMAGIC_EP_BUILT=ON
@@ -8,10 +8,3 @@
includedir="${prefix}/include"
Name: TileDB
@@ -11,4 +11,4 @@
Requires.private: @PKGCONF_REQ_PRIV@
Cflags: -I"${includedir}"
Libs: -L"${libdir}" -ltiledb
-Libs.private: -L"${libdir}" -ltiledb @PKGCONF_LIBS_PRIV@
\ No newline at end of file
+Libs.private: -L"${libdir}" -ltiledb @PKGCONF_LIBS_PRIV@
@@ -0,0 +1,22 @@
--- a/tiledb/platform/cert_file.h
+++ b/tiledb/platform/cert_file.h
@@ -134,6 +134,7 @@
*/
static std::string get() {
std::call_once(cert_file_initialized_, []() {
+#ifndef __ANDROID__
const std::array<std::string, 6> cert_files = {
"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL 6
@@ -142,6 +143,11 @@
"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", // CentOS/RHEL 7
"/etc/ssl/cert.pem" // Alpine Linux
};
+#else
+ const std::array<std::string, 1> cert_files = {
+ "@TERMUX_PREFIX@/etc/tls/cert.pem"
+ };
+#endif
for (const std::string& cert : cert_files) {
if (file_exists(cert)) {
@@ -0,0 +1,30 @@
--- a/tiledb/sm/fragment/fragment_metadata.cc
+++ b/tiledb/sm/fragment/fragment_metadata.cc
@@ -1719,11 +1719,11 @@
tile_min_var_buffer_[idx].size() - min_offset :
offsets[tile_idx + 1] - min_offset;
char* min = &tile_min_var_buffer_[idx][min_offset];
- return {min, size};
+ return {min, static_cast<unsigned int>(size)};
} else {
auto size = array_schema_->cell_size(name);
void* min = &tile_min_buffer_[idx][tile_idx * size];
- return {static_cast<char*>(min), size};
+ return {static_cast<char*>(min), static_cast<unsigned int>(size)};
}
}
@@ -1792,11 +1792,11 @@
tile_max_var_buffer_[idx].size() - max_offset :
offsets[tile_idx + 1] - max_offset;
char* max = &tile_max_var_buffer_[idx][max_offset];
- return {max, size};
+ return {max, static_cast<unsigned int>(size)};
} else {
auto size = array_schema_->cell_size(name);
void* max = &tile_max_buffer_[idx][tile_idx * size];
- return {static_cast<char*>(max), size};
+ return {static_cast<char*>(max), static_cast<unsigned int>(size)};
}
}
@@ -1,21 +0,0 @@
--- a/tiledb/sm/misc/constants.cc
+++ b/tiledb/sm/misc/constants.cc
@@ -643,6 +643,7 @@
* inspired by
* https://github.com/golang/go/blob/f0e940ebc985661f54d31c8d9ba31a553b87041b/src/crypto/x509/root_linux.go
*/
+#ifndef __ANDROID__
const std::array<std::string, 6> cert_files_linux = {
"/etc/ssl/certs/ca-certificates.crt", // Debian/Ubuntu/Gentoo etc.
"/etc/pki/tls/certs/ca-bundle.crt", // Fedora/RHEL 6
@@ -650,6 +651,10 @@
"/etc/pki/tls/cacert.pem", // OpenELEC
"/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", // CentOS/RHEL 7
"/etc/ssl/cert.pem" // Alpine Linux
+#else /* __ANDROID__ */
+const std::array<std::string, 1> cert_files_linux = {
+ "@TERMUX_PREFIX@/etc/tls/cert.pem"
+#endif
};
#endif
@@ -1,14 +0,0 @@
--- a/tiledb/sm/misc/constants.h
+++ b/tiledb/sm/misc/constants.h
@@ -567,7 +567,11 @@
#ifdef __linux__
/** List of possible certificates files for libcurl */
+#ifndef __ANDROID__
extern const std::array<std::string, 6> cert_files_linux;
+#else
+extern const std::array<std::string, 1> cert_files_linux;
+#endif
#endif
/** Delimiter for lists passed as config parameter */