This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit d0901285652b9069e67a0aaf2dbcd9b04c680116 Author: Marton Szasz <[email protected]> AuthorDate: Mon Oct 27 15:05:07 2025 +0100 MINIFICPP-2656 aws-sdk-cpp: cpp23 build fix, include cstdint Signed-off-by: Marton Szasz <[email protected]> Signed-off-by: Ferenc Gerlits <[email protected]> Closes #2053 --- cmake/BundledAwsSdkCpp.cmake | 5 ++++- thirdparty/aws-sdk-cpp/cpp23-cstdint.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cmake/BundledAwsSdkCpp.cmake b/cmake/BundledAwsSdkCpp.cmake index 818c4cb19..3a5d320eb 100644 --- a/cmake/BundledAwsSdkCpp.cmake +++ b/cmake/BundledAwsSdkCpp.cmake @@ -21,12 +21,15 @@ function(use_bundled_libaws SOURCE_DIR BINARY_DIR) set(PATCH_FILE3 "${SOURCE_DIR}/thirdparty/aws-sdk-cpp/bundle-openssl.patch") set(PATCH_FILE4 "${SOURCE_DIR}/thirdparty/aws-sdk-cpp/fix-finding-s2n.patch") set(PATCH_FILE5 "${SOURCE_DIR}/thirdparty/aws-sdk-cpp/fix-deprecated-literal-operator.patch") + set(PATCH_FILE6 "${SOURCE_DIR}/thirdparty/aws-sdk-cpp/cpp23-cstdint.patch") set(AWS_SDK_CPP_PATCH_COMMAND ${Bash_EXECUTABLE} -c "set -x &&\ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE1}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE1}\") &&\ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE2}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE2}\") &&\ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE3}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE3}\") &&\ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE4}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE4}\") &&\ - (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE5}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE5}\") ") + (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE5}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE5}\") &&\ + (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE6}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE6}\") &&\ + :") if (WIN32) set(LIBDIR "lib") diff --git a/thirdparty/aws-sdk-cpp/cpp23-cstdint.patch b/thirdparty/aws-sdk-cpp/cpp23-cstdint.patch new file mode 100644 index 000000000..a08c1e3cc --- /dev/null +++ b/thirdparty/aws-sdk-cpp/cpp23-cstdint.patch @@ -0,0 +1,11 @@ +diff -rupN a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/SecureRandom.h b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/SecureRandom.h +--- a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/SecureRandom.h 2025-10-22 14:54:38.270948821 +0200 ++++ b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/SecureRandom.h 2025-10-22 15:59:46.001684672 +0200 +@@ -6,6 +6,7 @@ + #include <type_traits> + #include <memory> + #include <cassert> ++#include <cstdint> + + namespace Aws + {
