Adding Windows patch to fix AWS bug (see aws/aws-sdk-cpp#3001)

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
o3de · Jun 19, 2024 · 133c55e · 133c55e
1 parent e37e2ae
commit 133c55e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/package-system/AWSNativeSDK/AWSNativeSDK-1.11.344-windows.patch b/package-system/AWSNativeSDK/AWSNativeSDK-1.11.344-windows.patch
@@ -0,0 +1,22 @@
+diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h b/src/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h
+index 90b61ccb0f..294a64afb5 100644
+--- a/src/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h
++++ b/src/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h
+@@ -62,14 +62,14 @@ namespace Aws
+             typedef Allocator<U> other;
+         };
+
+-        typename Base::pointer allocate(size_type n, const void *hint = nullptr)
++        typename std::allocator_traits<Base>::pointer allocate(size_type n, const void *hint = nullptr)
+         {
+             AWS_UNREFERENCED_PARAM(hint);
+
+-            return reinterpret_cast<typename Base::pointer>(Malloc("AWSSTL", n * sizeof(T)));
++            return reinterpret_cast<typename std::allocator_traits<Base>::pointer>(Malloc("AWSSTL", n * sizeof(T)));
+         }
+
+-        void deallocate(typename Base::pointer p, size_type n)
++        void deallocate(typename std::allocator_traits<Base>::pointer p, size_type n)
+         {
+             AWS_UNREFERENCED_PARAM(n);
+
diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json
@@ -14,6 +14,7 @@
          "Windows":{
             "package_version":"1.11.344-rev1",
             "cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
+            "patch_file":"AWSNativeSDK-1.11.344-windows.patch",
             "custom_build_cmd": [
                "build_AWSNativeSDK_windows.cmd"
             ],
@@ -67,7 +68,7 @@
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_11_288",
+               "aws_native_sdk_1_11_344",
                "20.04",
                "curl-7_68_0",
                "x86_64"
@@ -85,7 +86,7 @@
             "cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
             "custom_build_cmd": [
                "./build-linux.sh",
-               "aws_native_sdk_1_11_288",
+               "aws_native_sdk_1_11_344",
                "20.04",
                "curl-7_68_0",
                "aarch64"