Skip to content

Commit 970ff9b

Browse files
lordgamezszaszm
lordgamez
authored and
szaszm
committed
MINIFICPP-2813 Upgrade thirdparty libraries part 2
- Remove RTIMULib - Upgrade AWS SDK to v1.11.807 - Upgrade openssl lib to v3.6.2 - Upgrade gcp library to v2.47.1 - Upgrade libsodium to v1.0.22 - Upgrade curl to v8.20.0 - Upgrade spdlog library to v1.17.0 - Upgrade lixml2 to v2.15.3 - Upgrade catch2 library to v3.15.0 - Upgrade azure sdk and wil library to latest version - Upgrade asio library to v1.38.0 - Upgrade libarchive to v3.8.7 - Upgrade date library to v3.0.4 - Upgrade RocksDB to v11.1.1 Closes #2179 Signed-off-by: Marton Szasz <szaszm@apache.org>
1 parent 9d26b2a commit 970ff9b

22 files changed

Lines changed: 185 additions & 830 deletions

‎cmake/Asio.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
include(FetchContent)
1919

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

2525
FetchContent_GetProperties(asio)
2626
if(NOT asio_POPULATED)
2727
FetchContent_Populate(asio)
2828
add_library(asio INTERFACE)
29-
target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/asio/include)
29+
target_include_directories(asio SYSTEM INTERFACE ${asio_SOURCE_DIR}/include)
3030
find_package(Threads)
3131
target_link_libraries(asio INTERFACE Threads::Threads OpenSSL::SSL OpenSSL::Crypto)
3232
endif()

‎cmake/AzureSdkCpp.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ if (WIN32)
2222

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

5656
FetchContent_Declare(asdkext
57-
URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-identity_1.13.0.tar.gz
58-
URL_HASH "SHA256=a18ce70f8da11266b6a1aec3c02233ca889ea6137471a9f633131f00dfd386c0"
57+
URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-storage-queues_12.7.0.tar.gz
58+
URL_HASH "SHA256=a2d52cf30a36c1000cd6ee87fa60d5e3aa8d5b01a1716e5bc684dd5a507d76d5"
5959
PATCH_COMMAND "${PC}"
6060
SYSTEM
6161
)

‎cmake/BundledAwsSdkCpp.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR)
109109
ExternalProject_Add(
110110
aws-sdk-cpp-external
111111
GIT_REPOSITORY "https://github.com/aws/aws-sdk-cpp.git"
112-
GIT_TAG "1.11.771"
112+
GIT_TAG "1.11.807"
113113
UPDATE_COMMAND git submodule update --init --recursive
114114
SOURCE_DIR "${BINARY_DIR}/thirdparty/aws-sdk-cpp-src"
115115
INSTALL_DIR "${BINARY_DIR}/thirdparty/libaws-install"

‎cmake/BundledLibArchive.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ function(use_bundled_libarchive SOURCE_DIR BINARY_DIR)
6868

6969
ExternalProject_Add(
7070
libarchive-external
71-
URL "https://github.com/libarchive/libarchive/releases/download/v3.8.1/libarchive-3.8.1.tar.gz"
72-
URL_HASH "SHA256=bde832a5e3344dc723cfe9cc37f8e54bde04565bfe6f136bc1bd31ab352e9fab"
71+
URL "https://github.com/libarchive/libarchive/archive/refs/tags/v3.8.7.tar.gz"
72+
URL_HASH "SHA256=bc942030fe7cb30e04eed31bd5f63c38cdfd712315b303e91b64e58f05db2346"
7373
SOURCE_DIR "${BINARY_DIR}/thirdparty/libarchive-src"
7474
LIST_SEPARATOR % # This is needed for passing semicolon-separated lists
7575
CMAKE_ARGS ${LIBARCHIVE_CMAKE_ARGS}

‎cmake/BundledLibSodium.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
4040
endif()
4141

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

4848
if (WIN32)
4949
ExternalProject_Add(

‎cmake/BundledOpenSSL.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
8484
"-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON"
8585
)
8686

87-
set(OPENSSL_VERSION "3.3.6" CACHE STRING "" FORCE)
87+
set(OPENSSL_VERSION "3.6.2" CACHE STRING "" FORCE)
8888

8989
if (WIN32)
9090
find_program(JOM_EXECUTABLE_PATH
@@ -104,7 +104,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
104104
ExternalProject_Add(
105105
openssl-external
106106
URL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz"
107-
URL_HASH "SHA256=22db04f3c8f9a808c9795dcf7d2713ff40c12c410ea2d1f6435c6c9c8558958b"
107+
URL_HASH "SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
108108
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
109109
BUILD_IN_SOURCE true
110110
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}"
@@ -119,7 +119,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
119119
ExternalProject_Add(
120120
openssl-external
121121
URL "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz"
122-
URL_HASH "SHA256=22db04f3c8f9a808c9795dcf7d2713ff40c12c410ea2d1f6435c6c9c8558958b"
122+
URL_HASH "SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
123123
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
124124
BUILD_IN_SOURCE true
125125
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}"

‎cmake/BundledRTIMULib.cmake‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎cmake/BundledRocksDB.cmake‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
2323
include(LZ4)
2424
endif()
2525

26-
set(PATCH_FILE_1 "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/dboptions_equality_operator.patch")
27-
set(PATCH_FILE_2 "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/c++23_fixes.patch")
26+
set(PATCH_FILE "${SOURCE_DIR}/thirdparty/rocksdb/all/patches/dboptions_equality_operator.patch")
2827

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

3331

3432
# Define byproducts
@@ -71,8 +69,8 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
7169
# Build project
7270
ExternalProject_Add(
7371
rocksdb-external
74-
URL "https://github.com/facebook/rocksdb/archive/refs/tags/v10.2.1.tar.gz"
75-
URL_HASH "SHA256=d1ddfd3551e649f7e2d180d5a6a006d90cfde56dcfe1e548c58d95b7f1c87049"
72+
URL "https://github.com/facebook/rocksdb/archive/refs/tags/v11.1.1.tar.gz"
73+
URL_HASH "SHA256=63f11183fe40725a0e89a9e392f2c86c94b90064f1d95f5173a02cfe40de13f7"
7674
SOURCE_DIR "${BINARY_DIR}/thirdparty/rocksdb-src"
7775
CMAKE_ARGS ${ROCKSDB_CMAKE_ARGS}
7876
PATCH_COMMAND ${PC}

‎cmake/Catch2.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ include(FetchContent)
2020

2121
FetchContent_Declare(
2222
Catch2
23-
URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.9.1.tar.gz
24-
URL_HASH SHA256=a215c2a723bd7483efd236dc86066842a389cb4e344c61119c978acdf24d39be
23+
URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.15.0.tar.gz
24+
URL_HASH SHA256=9650c55e497759cc39b977e45524bc8acb15256061c112080916ab6cb0b1ea66
2525
SYSTEM
2626
)
2727
FetchContent_MakeAvailable(Catch2)

‎cmake/Date.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ include(FetchContent)
2020
if (WIN32)
2121
# tzdata and windowsZones.xml from unicode cldr-common are required to be installed for date-tz operation on Windows
2222
FetchContent_Declare(tzdata
23-
URL https://data.iana.org/time-zones/releases/tzdata2020e.tar.gz
24-
URL_HASH SHA256=0be1ba329eae29ae1b54057c3547b3e672f73b3ae7643aa87dac85122bec037e
23+
URL https://data.iana.org/time-zones/releases/tzdata2026b.tar.gz
24+
URL_HASH SHA256=114543d9f19a6bfeb5bca43686aea173d38755a3db1f2eec112647ae92c6f544
2525
SYSTEM
2626
)
2727
FetchContent_GetProperties(tzdata)
@@ -47,8 +47,8 @@ if (WIN32)
4747
endif()
4848

4949
FetchContent_Declare(date_src
50-
URL https://github.com/HowardHinnant/date/archive/1ead6715dec030d340a316c927c877a3c4e5a00c.tar.gz # master as of 2024-06-28
51-
URL_HASH SHA256=8b4096b7b49e06d756f4aa0949151863ab7b812679a1646039fab6e821d3c049
50+
URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.4.tar.gz
51+
URL_HASH SHA256=56e05531ee8994124eeb498d0e6a5e1c3b9d4fccbecdf555fe266631368fb55f
5252
SYSTEM
5353
)
5454
FetchContent_GetProperties(date_src)

0 commit comments

Comments
 (0)