[aws-crt-cpp/aws-sdk-cpp] Disable parallel configure (#20189)

7 files changed, 22 insertions, 12 deletions

diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake
index 7dc30421a..ffef30e94 100644
--- a/ports/aws-crt-cpp/portfile.cmake
+++ b/ports/aws-crt-cpp/portfile.cmake
@@ -4,14 +4,14 @@ vcpkg_from_github(
     REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1

     SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463

     PATCHES

-          fix-cmake-target-path.patch

+        fix-cmake-target-path.patch

 )

 

 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)

 

 vcpkg_cmake_configure(

     SOURCE_PATH "${SOURCE_PATH}"

-    PREFER_NINJA

+    DISABLE_PARALLEL_CONFIGURE

     OPTIONS

         "-DSTATIC_CRT=${STATIC_CRT}"

         "-DBUILD_DEPS=OFF"

@@ -35,14 +35,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()

 

 file(REMOVE_RECURSE

-	"${CURRENT_PACKAGES_DIR}/debug/include"

-	"${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp"

-	"${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"

+    "${CURRENT_PACKAGES_DIR}/debug/include"

+    "${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp"

+    "${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp"

 )

 

 vcpkg_copy_pdbs()

 

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

 

-# Handle copyright

 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json
index 6112538db..fb109b1a4 100644
--- a/ports/aws-crt-cpp/vcpkg.json
+++ b/ports/aws-crt-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-crt-cpp",
   "version": "0.15.1",
+  "port-version": 1,
   "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
   "homepage": "https://github.com/awslabs/aws-crt-cpp",
   "supports": "!arm & !uwp",
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index c9c44a800..66cc714a6 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -45,7 +45,7 @@ foreach(TARGET IN LISTS BUILD_ONLY)
     message(STATUS "Building ${TARGET}")

     vcpkg_cmake_configure(

         SOURCE_PATH "${SOURCE_PATH}"

-        PREFER_NINJA

+        DISABLE_PARALLEL_CONFIGURE

         OPTIONS

             ${EXTRA_ARGS}

             "-DENABLE_UNITY_BUILD=ON"

@@ -99,10 +99,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         file(REMOVE ${DEBUG_LIB_FILES})

     endif()

 

-    file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")

+    file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif")

 endif()

 

-configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)

+configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)

 

-# Handle copyright

 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index cc17dfcb3..3007b888b 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,6 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
+  "port-version": 1,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",
diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json
index e525f2011..d8c239816 100644
--- a/versions/a-/aws-crt-cpp.json
+++ b/versions/a-/aws-crt-cpp.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "60880034065d31bf96ac71028dab62955a77ba55",
+      "version": "0.15.1",
+      "port-version": 1
+    },
+    {
       "git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0",
       "version": "0.15.1",
       "port-version": 0
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 7b1adb482..43f797703 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5989ba8996df75b9195ef2f429191b48602236c9",
+      "version": "1.9.96",
+      "port-version": 1
+    },
+    {
       "git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa",
       "version": "1.9.96",
       "port-version": 0
diff --git a/versions/baseline.json b/versions/baseline.json
index 333dd7e7d..b49a8129e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -290,7 +290,7 @@
     },
     "aws-crt-cpp": {
       "baseline": "0.15.1",
-      "port-version": 0
+      "port-version": 1
     },
     "aws-lambda-cpp": {
       "baseline": "0.2.6",
@@ -298,7 +298,7 @@
     },
     "aws-sdk-cpp": {
       "baseline": "1.9.96",
-      "port-version": 0
+      "port-version": 1
     },
     "azmq": {
       "baseline": "2020-03-03",