From dd4c769a893b6c3cbe58d1afcb56b453df87bbee Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:29:09 +0800
Subject: [PATCH] [eastl] Fix error C2338 (#21538)

* [eastl] Fix error C2338

* update patch

* Add license

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
---
 ports/eastl/Fix-error-C2338.patch | 14 ++++++++++++++
 ports/eastl/portfile.cmake        |  1 +
 ports/eastl/vcpkg.json            |  3 ++-
 versions/baseline.json            |  2 +-
 versions/e-/eastl.json            |  5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 ports/eastl/Fix-error-C2338.patch

diff --git a/ports/eastl/Fix-error-C2338.patch b/ports/eastl/Fix-error-C2338.patch
new file mode 100644
index 0000000000..61d75dddc6
--- /dev/null
+++ b/ports/eastl/Fix-error-C2338.patch
@@ -0,0 +1,14 @@
+diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
+index 08b6af5..281665e 100644
+--- a/scripts/CMake/CommonCppFlags.cmake
++++ b/scripts/CMake/CommonCppFlags.cmake
+@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+     endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
++    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95")
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-")
++    endif()
+ endif()
+ 
+ 
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake
index d362ac0f41..04ba63fc55 100644
--- a/ports/eastl/portfile.cmake
+++ b/ports/eastl/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES 
         fix_cmake_install.patch
+        Fix-error-C2338.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json
index e496d68076..b2c97ba50c 100644
--- a/ports/eastl/vcpkg.json
+++ b/ports/eastl/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "eastl",
   "version-string": "3.18.00",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.",
   "homepage": "https://github.com/electronicarts/EASTL",
+  "license": "BSD-3-Clause",
   "dependencies": [
     "eabase",
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 207cdfcf5c..b5ead758ec 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1950,7 +1950,7 @@
     },
     "eastl": {
       "baseline": "3.18.00",
-      "port-version": 1
+      "port-version": 2
     },
     "easycl": {
       "baseline": "0.3",
diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json
index 7a67948716..a62180cf88 100644
--- a/versions/e-/eastl.json
+++ b/versions/e-/eastl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb",
+      "version-string": "3.18.00",
+      "port-version": 2
+    },
     {
       "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c",
       "version-string": "3.18.00",