From 148fba1d1a5ec07383aaff4c603c17a1d25399a7 Mon Sep 17 00:00:00 2001
From: Ahmed Yarub Hani Al Nuaimi <ahmedyarub@yahoo.com>
Date: Fri, 26 Nov 2021 06:20:02 -0300
Subject: [PATCH] Fix building AWS SDK for C++  with CMake 3.22.0 (#21668)

* Fix AWS SDK for C++ configuration

* Update versions

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
---
 ports/aws-sdk-cpp/fix-config.patch | 12 ++++++++++++
 ports/aws-sdk-cpp/portfile.cmake   |  1 +
 ports/aws-sdk-cpp/vcpkg.json       |  2 +-
 versions/a-/aws-sdk-cpp.json       |  5 +++++
 versions/baseline.json             |  2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 ports/aws-sdk-cpp/fix-config.patch

diff --git a/ports/aws-sdk-cpp/fix-config.patch b/ports/aws-sdk-cpp/fix-config.patch
new file mode 100644
index 0000000000..8b9e3a76db
--- /dev/null
+++ b/ports/aws-sdk-cpp/fix-config.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
+--- a/cmake/AWSSDKConfig.cmake	(revision e2d3e09f6f50167bb7886109eb15605eb2a0b578)
++++ b/cmake/AWSSDKConfig.cmake	(date 1637856904387)
+@@ -129,7 +129,7 @@
+ get_filename_component(TEMP_PATH "${AWSSDK_CORE_LIB_FILE}" PATH)
+ get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME)
+ 
+-while (NOT TEMP_NAME STREQUAL ${LIB_SEARCH_PREFIX})
++while (NOT TEMP_NAME STREQUAL "${LIB_SEARCH_PREFIX}")
+     set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}")
+     get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH)
+     get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME)
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 2d6bba4d10..26c6a83280 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF b0204a7b6a33211f533a175e987a755f714bf7f3 # 1.9.96
     SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d
     PATCHES
+        fix-config.patch
         patch-relocatable-rpath.patch
         fix-aws-root.patch
 )
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 3836e2b619..f4065a4b48 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
-  "port-version": 5,
+  "port-version": 6,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 6b4fb1128d..e82e560e41 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f3e8e88a0bf271817cd42083f58070df1a006603",
+      "version": "1.9.96",
+      "port-version": 6
+    },
     {
       "git-tree": "2da283f5bdb07366001a8b14674c0961ac173566",
       "version": "1.9.96",
diff --git a/versions/baseline.json b/versions/baseline.json
index b13aa635b5..8aa7557e76 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -306,7 +306,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.9.96",
-      "port-version": 5
+      "port-version": 6
     },
     "azmq": {
       "baseline": "2020-03-03",