Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/Asio.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
include(FetchContent)

FetchContent_Declare(asio
URL https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-34-2.tar.gz
URL_HASH SHA256=f3bac015305fbb700545bd2959fbc52d75a1ec2e05f9c7f695801273ceb78cf5
URL https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-38-0.tar.gz
URL_HASH SHA256=5cf78ede456fd13b95fe692711f4f689be26c826f1f5541c7a1df3aa32bd9dbd
SYSTEM)

FetchContent_GetProperties(asio)
if(NOT asio_POPULATED)
FetchContent_Populate(asio)
add_library(asio INTERFACE)
target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/asio/include)
target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/include)
find_package(Threads)
target_link_libraries(asio INTERFACE Threads::Threads OpenSSL::SSL OpenSSL::Crypto)
endif()
8 changes: 4 additions & 4 deletions cmake/AzureSdkCpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ if (WIN32)

FetchContent_Declare(
wil
URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.250325.1.tar.gz
URL_HASH SHA256=c9e667d5f86ded43d17b5669d243e95ca7b437e3a167c170805ffd4aa8a9a786
URL https://github.com/microsoft/wil/archive/refs/tags/v1.0.260126.7.tar.gz
URL_HASH SHA256=de9e03b38ff0ff8d22048f00b111cb631d21c550328f12530ccba71c05c9e361
SYSTEM
)
FetchContent_MakeAvailable(wil)
Expand Down Expand Up @@ -54,8 +54,8 @@ set(PC ${Bash_EXECUTABLE} -c "set -x &&\
(\\\"${Patch_EXECUTABLE}\\\" -p1 -R -s -f --dry-run -i \\\"${PATCH_FILE_4}\\\" || \\\"${Patch_EXECUTABLE}\\\" -p1 -N -i \\\"${PATCH_FILE_4}\\\")")

FetchContent_Declare(asdkext
URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-identity_1.13.0.tar.gz
URL_HASH "SHA256=a18ce70f8da11266b6a1aec3c02233ca889ea6137471a9f633131f00dfd386c0"
URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-storage-queues_12.7.0.tar.gz
URL_HASH "SHA256=a2d52cf30a36c1000cd6ee87fa60d5e3aa8d5b01a1716e5bc684dd5a507d76d5"
PATCH_COMMAND "${PC}"
SYSTEM
)
Expand Down
2 changes: 1 addition & 1 deletion cmake/BundledAwsSdkCpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
aws-sdk-cpp-external
GIT_REPOSITORY "https://github.com/aws/aws-sdk-cpp.git"
GIT_TAG "1.11.771"
GIT_TAG "1.11.807"
UPDATE_COMMAND git submodule update --init --recursive
SOURCE_DIR "${BINARY_DIR}/thirdparty/aws-sdk-cpp-src"
INSTALL_DIR "${BINARY_DIR}/thirdparty/libaws-install"
Expand Down
4 changes: 2 additions & 2 deletions cmake/BundledLibArchive.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function(use_bundled_libarchive SOURCE_DIR BINARY_DIR)

ExternalProject_Add(
libarchive-external
URL "https://github.com/libarchive/libarchive/releases/download/v3.8.1/libarchive-3.8.1.tar.gz"
URL_HASH "SHA256=bde832a5e3344dc723cfe9cc37f8e54bde04565bfe6f136bc1bd31ab352e9fab"
URL "https://github.com/libarchive/libarchive/archive/refs/tags/v3.8.7.tar.gz"
URL_HASH "SHA256=bc942030fe7cb30e04eed31bd5f63c38cdfd712315b303e91b64e58f05db2346"
SOURCE_DIR "${BINARY_DIR}/thirdparty/libarchive-src"
LIST_SEPARATOR % # This is needed for passing semicolon-separated lists
CMAKE_ARGS ${LIBARCHIVE_CMAKE_ARGS}
Expand Down
8 changes: 4 additions & 4 deletions cmake/BundledLibSodium.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
endif()

# Build project
set(LIBSODIUM_OFFICIAL_MIRROR_URL https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz)
set(LIBSODIUM_GITHUB_MIRROR_URL https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz)
set(LIBSODIUM_GENTOO_MIRROR_URL https://gentoo.osuosl.org/distfiles/libsodium-1.0.18.tar.gz)
set(LIBSODIUM_URL_HASH "SHA256=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1")
set(LIBSODIUM_OFFICIAL_MIRROR_URL https://download.libsodium.org/libsodium/releases/libsodium-1.0.22.tar.gz)
set(LIBSODIUM_GITHUB_MIRROR_URL https://github.com/jedisct1/libsodium/releases/download/1.0.22-RELEASE/libsodium-1.0.22.tar.gz)
set(LIBSODIUM_GENTOO_MIRROR_URL https://gentoo.osuosl.org/distfiles/libsodium-1.0.22.tar.gz)
set(LIBSODIUM_URL_HASH "SHA256=adbdd8f16149e81ac6078a03aca6fc03b592b89ef7b5ed83841c086191be3349")

if (WIN32)
ExternalProject_Add(
Expand Down
6 changes: 3 additions & 3 deletions cmake/BundledOpenSSL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
"-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON"
)

set(OPENSSL_VERSION "3.3.6" CACHE STRING "" FORCE)
set(OPENSSL_VERSION "3.6.2" CACHE STRING "" FORCE)

if (WIN32)
find_program(JOM_EXECUTABLE_PATH
Expand All @@ -104,7 +104,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
openssl-external
URL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz"
URL_HASH "SHA256=22db04f3c8f9a808c9795dcf7d2713ff40c12c410ea2d1f6435c6c9c8558958b"
URL_HASH "SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
BUILD_IN_SOURCE true
CONFIGURE_COMMAND perl Configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${OPENSSL_C_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${OPENSSL_WINDOWS_COMPILE_FLAGS}" ${OPENSSL_SHARED_FLAG} ${OPENSSL_EXTRA_FLAGS} "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}"
Expand All @@ -119,7 +119,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
openssl-external
URL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz"
URL_HASH "SHA256=22db04f3c8f9a808c9795dcf7d2713ff40c12c410ea2d1f6435c6c9c8558958b"
URL_HASH "SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
BUILD_IN_SOURCE true
CONFIGURE_COMMAND ./Configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${OPENSSL_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" ${OPENSSL_SHARED_FLAG} ${OPENSSL_EXTRA_FLAGS} "--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}"
Expand Down
51 changes: 0 additions & 51 deletions cmake/BundledRTIMULib.cmake

This file was deleted.

10 changes: 4 additions & 6 deletions cmake/BundledRocksDB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
include(LZ4)
endif()

set(PATCH_FILE_1 "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/dboptions_equality_operator.patch")
set(PATCH_FILE_2 "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/c++23_fixes.patch")
Comment thread
fgerlits marked this conversation as resolved.
set(PATCH_FILE "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/dboptions_equality_operator.patch")

set(PC ${Bash_EXECUTABLE} -c "set -x &&\
(\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE_1}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE_1}\") &&\
(\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE_2}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE_2}\") ")
(\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE}\") ")


# Define byproducts
Expand Down Expand Up @@ -71,8 +69,8 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
# Build project
ExternalProject_Add(
rocksdb-external
URL "https://github.com/facebook/rocksdb/archive/refs/tags/v10.2.1.tar.gz"
URL_HASH "SHA256=d1ddfd3551e649f7e2d180d5a6a006d90cfde56dcfe1e548c58d95b7f1c87049"
URL "https://github.com/facebook/rocksdb/archive/refs/tags/v11.1.1.tar.gz"
URL_HASH "SHA256=63f11183fe40725a0e89a9e392f2c86c94b90064f1d95f5173a02cfe40de13f7"
SOURCE_DIR "${BINARY_DIR}/thirdparty/rocksdb-src"
CMAKE_ARGS ${ROCKSDB_CMAKE_ARGS}
PATCH_COMMAND ${PC}
Expand Down
4 changes: 2 additions & 2 deletions cmake/Catch2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ include(FetchContent)

FetchContent_Declare(
Catch2
URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.9.1.tar.gz
URL_HASH SHA256=a215c2a723bd7483efd236dc86066842a389cb4e344c61119c978acdf24d39be
URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.15.0.tar.gz
URL_HASH SHA256=9650c55e497759cc39b977e45524bc8acb15256061c112080916ab6cb0b1ea66
SYSTEM
)
FetchContent_MakeAvailable(Catch2)
8 changes: 4 additions & 4 deletions cmake/Date.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ include(FetchContent)
if (WIN32)
# tzdata and windowsZones.xml from unicode cldr-common are required to be installed for date-tz operation on Windows
FetchContent_Declare(tzdata
URL https://data.iana.org/time-zones/releases/tzdata2020e.tar.gz
URL_HASH SHA256=0be1ba329eae29ae1b54057c3547b3e672f73b3ae7643aa87dac85122bec037e
URL https://data.iana.org/time-zones/releases/tzdata2026b.tar.gz
URL_HASH SHA256=114543d9f19a6bfeb5bca43686aea173d38755a3db1f2eec112647ae92c6f544
SYSTEM
)
FetchContent_GetProperties(tzdata)
Expand All @@ -47,8 +47,8 @@ if (WIN32)
endif()

FetchContent_Declare(date_src
URL https://github.com/HowardHinnant/date/archive/1ead6715dec030d340a316c927c877a3c4e5a00c.tar.gz # master as of 2024-06-28
URL_HASH SHA256=8b4096b7b49e06d756f4aa0949151863ab7b812679a1646039fab6e821d3c049
URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.4.tar.gz
URL_HASH SHA256=56e05531ee8994124eeb498d0e6a5e1c3b9d4fccbecdf555fe266631368fb55f
SYSTEM
)
FetchContent_GetProperties(date_src)
Expand Down
4 changes: 2 additions & 2 deletions cmake/FetchLibcURL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ set(PC "${Patch_EXECUTABLE}" -p1 -i "${PATCH_FILE}")

FetchContent_Declare(
curl
URL "https://github.com/curl/curl/releases/download/curl-8_19_0/curl-8.19.0.tar.gz"
URL_HASH "SHA256=2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71"
URL "https://github.com/curl/curl/archive/refs/tags/curl-8_20_0.tar.gz"
URL_HASH "SHA256=738fe8ae973a6f171b4e7cf7146edd19894e19f09cd45a3b673ebdba3549a435"
PATCH_COMMAND ${PC}
SYSTEM
OVERRIDE_FIND_PACKAGE
Expand Down
4 changes: 2 additions & 2 deletions cmake/GoogleCloudCpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ set(GOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK OFF CACHE INTERNAL macos-openssl
set(BUILD_TESTING OFF CACHE INTERNAL testing-off)
set(GOOGLE_CLOUD_CPP_ENABLE_WERROR OFF CACHE INTERNAL warnings-off)
FetchContent_Declare(google-cloud-cpp
URL https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.45.0.tar.gz
URL_HASH SHA256=3d1b5eb696832f9071bf7ef0b3f0c9fd27c1a39d5edcb8a9976c65193319fd01
URL https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.47.1.tar.gz
URL_HASH SHA256=8863056af88460e449264a976f64a0c9f4f3d98477cdad7770c2dca353fea68c
PATCH_COMMAND "${PC}"
SYSTEM)
if (WIN32)
Expand Down
4 changes: 2 additions & 2 deletions cmake/LibXml2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ set(LIBXML2_WITH_ICU OFF CACHE BOOL "" FORCE)
include(FetchContent)
FetchContent_Declare(
libxml2
URL https://github.com/GNOME/libxml2/archive/refs/tags/v2.15.0.tar.gz
URL_HASH SHA256=e24bd5209afefe390e704ebc55649c7ae240e1f157cefd433ccc86c610d20aac
URL https://github.com/GNOME/libxml2/archive/refs/tags/v2.15.3.tar.gz
URL_HASH SHA256=5c6060277173270356c3f1c321a640ab629bdabc5e5ba9095b99e00759ba0c39
SYSTEM
)
FetchContent_MakeAvailable(libxml2)
Expand Down
4 changes: 2 additions & 2 deletions cmake/Spdlog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ set(SPDLOG_FMT_EXTERNAL ON CACHE STRING "" FORCE)
set(SPDLOG_SYSTEM_INCLUDES ON CACHE STRING "" FORCE)

FetchContent_Declare(Spdlog
URL https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz
URL_HASH SHA256=15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67
URL https://github.com/gabime/spdlog/archive/refs/tags/v1.17.0.tar.gz
URL_HASH SHA256=d8862955c6d74e5846b3f580b1605d2428b11d97a410d86e2fb13e857cd3a744
OVERRIDE_FIND_PACKAGE
SYSTEM
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self, test_context: MinifiTestContext):
azure_storage_hostname = f"azure-storage-server-{test_context.scenario_id}"
self.azure_connection_string = "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;" \
f"BlobEndpoint=http://{azure_storage_hostname}:10000/devstoreaccount1;QueueEndpoint=http://{azure_storage_hostname}:10001/devstoreaccount1;"
self.command = ["azurite", "-l", "/data", "--blobHost", "0.0.0.0", "--queueHost", "0.0.0.0", "--tableHost", "0.0.0.0", "--skipApiVersionCheck"]

def deploy(self, context: MinifiTestContext | None) -> bool:
super().deploy(context)
Expand Down
4 changes: 2 additions & 2 deletions extensions/rocksdb-repos/database/RocksDbInstance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ std::optional<OpenRocksDb> RocksDbInstance::open(const std::string& column) {
if (!impl_) {
gsl_Expects(columns_.empty());
// database needs to be (re)opened
rocksdb::DB* db_instance = nullptr;
std::unique_ptr<rocksdb::DB> db_instance;
rocksdb::Status result;

std::vector<DBOptionsPatch> dbo_patches;
Expand Down Expand Up @@ -202,7 +202,7 @@ std::optional<OpenRocksDb> RocksDbInstance::open(const std::string& column) {
gsl_Expects(db_instance);
// the patches could have internal resources that we need to keep alive
// as long as the database is open (e.g. custom environment)
impl_ = std::make_shared<DbHandle>(std::unique_ptr<rocksdb::DB>(db_instance), std::move(dbo_patches));
impl_ = std::make_shared<DbHandle>(std::move(db_instance), std::move(dbo_patches));
for (size_t cf_idx{0}; cf_idx < column_handles.size(); ++cf_idx) {
ColumnFamilyOptionsPatch cfo_patch;
if (auto it = column_configs_.find(column_handles[cf_idx]->GetName()); it != column_configs_.end()) {
Expand Down
4 changes: 2 additions & 2 deletions extensions/rocksdb-repos/tests/RocksDBTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct RocksDBTest : TestController {
}

[[nodiscard]] OpenDatabase openDB(const std::vector<std::string>& cf_names) const {
rocksdb::DB* db_ptr = nullptr;
std::unique_ptr<rocksdb::DB> db_ptr;
std::vector<rocksdb::ColumnFamilyHandle*> cf_handle_ptrs;
std::vector<rocksdb::ColumnFamilyDescriptor> cf_descs;
cf_descs.reserve(cf_names.size());
Expand All @@ -57,7 +57,7 @@ struct RocksDBTest : TestController {
for (auto cf_ptr : cf_handle_ptrs) {
cf_handles[cf_ptr->GetName()].reset(cf_ptr);
}
return {std::unique_ptr<rocksdb::DB>(db_ptr), std::move(cf_handles)};
return {std::move(db_ptr), std::move(cf_handles)};
}

std::string db_dir;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@ index 9a98f204e..95260d243 100644
--
2.50.1

--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/structured_message_helper.hpp 2026-05-12 12:38:20.000000000 +0200
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/structured_message_helper.hpp 2026-05-19 12:56:55.877826558 +0200
@@ -7,6 +7,7 @@
#include <functional>
#include <memory>
#include <vector>
+#include <cinttypes>

namespace Azure { namespace Storage { namespace _internal {

13 changes: 7 additions & 6 deletions thirdparty/curl/module-path.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
diff -rupN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2026-01-07 07:57:50.000000000 +0100
+++ b/CMakeLists.txt 2026-02-06 16:52:59.927109936 +0100
@@ -45,7 +45,7 @@ if(NOT "$ENV{CURL_BUILDINFO}$ENV{CURL_CI
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dd9c7aa70..d92ca3ae78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ if(NOT "$ENV{CURL_BUILDINFO}$ENV{CURL_CI}$ENV{CI}" STREQUAL "")
endforeach()
endif()

-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
include(Utilities)
include(Macros)
Expand Down
Loading
Loading