From e33e6236f1251e390291cc08e13af8743fe46363 Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Thu, 18 Nov 2021 23:39:11 -0800 Subject: [PATCH 1/3] [eastl] Fix error C2338 --- ports/eastl/Fix-error-C2338.patch | 13 +++++++++++++ ports/eastl/portfile.cmake | 1 + ports/eastl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/eastl.json | 5 +++++ 5 files changed, 21 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 00000000000000..e09ce82cdf8133 --- /dev/null +++ b/ports/eastl/Fix-error-C2338.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake +index 08b6af5..99b6d16 100644 +--- a/scripts/CMake/CommonCppFlags.cmake ++++ b/scripts/CMake/CommonCppFlags.cmake +@@ -73,7 +73,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.") + endif() + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:static_assert-") + endif() + + diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index d362ac0f41d1d5..04ba63fc55c9a6 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 e496d68076cd63..f023e8e469941e 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,7 +1,7 @@ { "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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dbcde5a8020b8e..950c174b7601ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1938,7 +1938,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 7a67948716fa29..1eef5cb69b7c18 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ca8497358818a1b5289709bee430e6d02fd9178", + "version-string": "3.18.00", + "port-version": 2 + }, { "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c", "version-string": "3.18.00", From f57d4cac7a04b8c7a0507b3fc2d7582b03caea1b Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Mon, 7 Feb 2022 22:34:42 -0800 Subject: [PATCH 2/3] update patch --- ports/eastl/Fix-error-C2338.patch | 11 ++++++----- versions/e-/eastl.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/eastl/Fix-error-C2338.patch b/ports/eastl/Fix-error-C2338.patch index e09ce82cdf8133..61d75dddc6461a 100644 --- a/ports/eastl/Fix-error-C2338.patch +++ b/ports/eastl/Fix-error-C2338.patch @@ -1,13 +1,14 @@ diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake -index 08b6af5..99b6d16 100644 +index 08b6af5..281665e 100644 --- a/scripts/CMake/CommonCppFlags.cmake +++ b/scripts/CMake/CommonCppFlags.cmake -@@ -73,7 +73,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.") +@@ -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-") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:static_assert-") + 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/versions/e-/eastl.json b/versions/e-/eastl.json index 1eef5cb69b7c18..905a73639b0659 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ca8497358818a1b5289709bee430e6d02fd9178", + "git-tree": "1a98aba0e3cd0434a968afac9a1f9639543d28b0", "version-string": "3.18.00", "port-version": 2 }, From 84ded08d4b646849012a909a16ae57eed529aae4 Mon Sep 17 00:00:00 2001 From: Cheney-Wang Date: Mon, 7 Feb 2022 23:28:46 -0800 Subject: [PATCH 3/3] Add license --- ports/eastl/vcpkg.json | 1 + versions/e-/eastl.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index f023e8e469941e..b2c97ba50c24c0 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -4,6 +4,7 @@ "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/e-/eastl.json b/versions/e-/eastl.json index 905a73639b0659..a62180cf88363c 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1a98aba0e3cd0434a968afac9a1f9639543d28b0", + "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", "version-string": "3.18.00", "port-version": 2 },