diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 5e0c40bf7c..9a0c698db3 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,5 +1,5 @@ Source: eastl -Version: 3.14.00 +Version: 3.14.01 Homepage: https://github.com/electronicarts/EASTL 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. diff --git a/ports/eastl/fixchar8_t.patch b/ports/eastl/fixchar8_t.patch deleted file mode 100644 index 51fcfe69a5..0000000000 --- a/ports/eastl/fixchar8_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake -index 566fbee..4fcca61 100644 ---- a/scripts/CMake/CommonCppFlags.cmake -+++ b/scripts/CMake/CommonCppFlags.cmake -@@ -54,7 +54,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:char8_t-") - endif() - - diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index e1c1a0d449..fcbe02f7e1 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -17,11 +17,10 @@ set(EABASE_PATH ${SOURCE_PATH}) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF dcd2b838d52de13691999aff8faeaa8f284928ac - SHA512 9756ee47a30447f17ceb45fb5143d6e80905636cf709c171059a83f74094fb25391c896de0ea5e063cdad4e7334c5f963c75b1c34ad539fd24175983a2054159 + REF 3.14.01 + SHA512 efc03bdd4b6371b3fb4b75cac31ce3081290e9177453914a4fbb601d1ba44d65a86f2e98b7b27efbd985f37bd59a80169cf58beb3a32e5b3672ea2a2d6dd78d1 HEAD_REF master PATCHES - fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved fix_cmake_install.patch )