Skip to content

Commit

Permalink
Merge pull request OSGeo#9904 from rouault/ubuntu_full_tiledb_2_23
Browse files Browse the repository at this point in the history
docker/ubuntu-full: update to tiledb 2.23.0 [ci skip]
  • Loading branch information
rouault authored May 14, 2024
2 parents cae1d97 + 1e79268 commit c93c4af
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 10 deletions.
20 changes: 10 additions & 10 deletions docker/ubuntu-full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,25 +128,25 @@ RUN . /buildscripts/bh-set-envvars.sh \
&& for i in /build_thirdparty/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done

# Build tiledb
ARG TILEDB_VERSION=2.17.4
ARG TILEDB_VERSION=2.23.0
COPY ./tiledb-FindLZ4_EP.cmake.patch /buildscripts/tiledb-FindLZ4_EP.cmake.patch
COPY ./tiledb-FindOpenSSL_EP.cmake.patch /buildscripts/tiledb-FindOpenSSL_EP.cmake.patch
RUN . /buildscripts/bh-set-envvars.sh \
&& apt-get update -y \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
libspdlog-dev${APT_ARCH_SUFFIX} \
libspdlog-dev${APT_ARCH_SUFFIX} libmagic-dev${APT_ARCH_SUFFIX} \
&& mkdir tiledb \
&& wget -q https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.tar.gz -O - \
| tar xz -C tiledb --strip-components=1 \
&& cd tiledb \
&& patch -p0 < /buildscripts/tiledb-FindLZ4_EP.cmake.patch \
&& patch -p0 < /buildscripts/tiledb-FindOpenSSL_EP.cmake.patch \
&& mkdir build_cmake \
&& cd build_cmake \
&& ../bootstrap --prefix=/usr --disable-werror --disable-tests --disable-avx2 --disable-webp \
&& cmake .. -DOPENSSL_INCLUDE_DIR=/usr/include -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libcrypto.so -DOPENSSL_SSL_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libssl.so \
&& cd tiledb \
&& cmake ../.. -DOPENSSL_INCLUDE_DIR=/usr/include -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libcrypto.so -DOPENSSL_SSL_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libssl.so \
&& cd .. \
&& cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTILEDB_WERROR=OFF -DTILEDB_SUPERBUILD=OFF -DTILEDB_TESTS=OFF -DCOMPILER_SUPPORTS_AVX2=FALSE -DOPENSSL_INCLUDE_DIR=/usr/include -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libcrypto.so -DOPENSSL_SSL_LIBRARY=/usr/lib/${GCC_ARCH}-linux-gnu/libssl.so \
&& make -j$(nproc) \
&& make install-tiledb DESTDIR="/build_thirdparty" \
&& make install-tiledb \
&& make -j$(nproc) install DESTDIR="/build_thirdparty" \
&& make -j$(nproc) install \
&& cd ../.. \
&& rm -rf tiledb \
&& for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
Expand Down Expand Up @@ -324,7 +324,7 @@ RUN apt-get update \
libbrotli1 \
libarchive13 \
libaec0 \
libspdlog1.12 \
libspdlog1.12 libmagic1t64 \
python-is-python3 \
# pil for antialias option of gdal2tiles
python3-pil \
Expand Down
17 changes: 17 additions & 0 deletions docker/ubuntu-full/tiledb-FindLZ4_EP.cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--- cmake/Modules/FindLZ4_EP.cmake 2024-05-10 22:51:18.653929735 +0200
+++ cmake/Modules/FindLZ4_EP.cmake 2024-05-10 22:51:44.045893652 +0200
@@ -34,10 +34,10 @@
# Include some common helper functions.
include(TileDBCommon)

-if(TILEDB_VCPKG)
- find_package(lz4 REQUIRED)
- return()
-endif()
+#if(TILEDB_VCPKG)
+# find_package(lz4 REQUIRED)
+# return()
+#endif()

# First check for a static version in the EP prefix.
find_library(LZ4_LIBRARIES
17 changes: 17 additions & 0 deletions docker/ubuntu-full/tiledb-FindOpenSSL_EP.cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--- cmake/Modules/FindOpenSSL_EP.cmake 2024-05-10 23:53:01.989001899 +0200
+++ cmake/Modules/FindOpenSSL_EP.cmake 2024-05-10 23:53:12.489022706 +0200
@@ -33,10 +33,10 @@
# Include some common helper functions.
include(TileDBCommon)

-if (TILEDB_VCPKG)
- find_package(OpenSSL REQUIRED)
- return()
-endif()
+#if (TILEDB_VCPKG)
+# find_package(OpenSSL REQUIRED)
+# return()
+#endif()

# Search the path set during the superbuild for the EP.
set(OPENSSL_PATHS ${TILEDB_EP_INSTALL_PREFIX})

0 comments on commit c93c4af

Please sign in to comment.