diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-05-10 06:14:38 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 15:14:38 -0700 |
| commit | 64f8fb7b8636d0d9c36aaea7f31cbdb5ff3e852d (patch) | |
| tree | 10c31a4d63eaa8dab28ed84518f8b76e71ac0984 | |
| parent | e2f45664c96a7e3f1881785ac8e66f5581158935 (diff) | |
| download | vcpkg-64f8fb7b8636d0d9c36aaea7f31cbdb5ff3e852d.tar.gz vcpkg-64f8fb7b8636d0d9c36aaea7f31cbdb5ff3e852d.zip | |
[eastl]Add option(/Zc:char8_t-) to fix compile issue (#6360)
| -rw-r--r-- | ports/eastl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/eastl/fixchar8_t.patch | 13 | ||||
| -rw-r--r-- | ports/eastl/portfile.cmake | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index b803366d8..2b6f5984e 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,4 @@ Source: eastl
-Version: 3.13.05 +Version: 3.13.05-1 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 new file mode 100644 index 000000000..51fcfe69a --- /dev/null +++ b/ports/eastl/fixchar8_t.patch @@ -0,0 +1,13 @@ +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 2d6f11102..13cf14a21 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -6,9 +6,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
- REF 3.13.05 + REF 3.13.05
SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
HEAD_REF master
+ PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
)
vcpkg_configure_cmake(
|