From 8fe8cf468bb936d331fc72d0b388ed36a7e61dd0 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Tue, 4 Jun 2019 17:23:04 +0800
Subject: [entityx][entt] Disable parallel configure (#6736)

* [entityx][entt] Disable parallel configure

* [entityx][entt] Remove the invalid patch
---
 ports/entityx/CONTROL         |  2 +-
 ports/entityx/fix-cmake.patch | 40 ----------------------------------------
 ports/entityx/portfile.cmake  |  2 +-
 ports/entt/CONTROL            |  2 +-
 ports/entt/portfile.cmake     |  1 +
 5 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 ports/entityx/fix-cmake.patch

diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL
index 0a41ad86d..b381966b5 100644
--- a/ports/entityx/CONTROL
+++ b/ports/entityx/CONTROL
@@ -1,3 +1,3 @@
 Source: entityx
-Version: 1.3.0
+Version: 1.3.0-1
 Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
diff --git a/ports/entityx/fix-cmake.patch b/ports/entityx/fix-cmake.patch
deleted file mode 100644
index 143cc52b1..000000000
--- a/ports/entityx/fix-cmake.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 87309bf..23f5063 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(CheckCXXSourceCompiles)
- 
- # Default compiler args
-+if(0)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)")
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11")
- 	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-@@ -41,6 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- 	set(CMAKE_CXX_FLAGS_RELEASE "/Ox -DNDEBUG")
- 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG")
- endif()
-+endif()
- 
- # if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- #     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors")
-@@ -156,9 +158,9 @@ endif (ENTITYX_BUILD_TESTING)
- 
- configure_file(
-     ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h.in
--    ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h
-+    ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h
- )
--
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
- if (NOT WINDOWS OR CYGWIN)
-     set(entityx_libs -lentityx)
-@@ -179,6 +181,7 @@ install(
-     DESTINATION "include"
-     FILES_MATCHING PATTERN "*.h"
-     )
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h DESTINATION include/entityx)
- 
- install(
-     TARGETS ${install_libs}
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
index 36e3ddf19..b55f5f602 100644
--- a/ports/entityx/portfile.cmake
+++ b/ports/entityx/portfile.cmake
@@ -9,12 +9,12 @@ vcpkg_from_github(
     SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d
     HEAD_REF master
     PATCHES
-        fix-cmake.patch
         enable-std14.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
         -DENTITYX_BUILD_TESTING=false
diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL
index 47770ebd1..37f95a699 100644
--- a/ports/entt/CONTROL
+++ b/ports/entt/CONTROL
@@ -1,3 +1,3 @@
 Source: entt
-Version: 3.0.0
+Version: 3.0.0-1
 Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt>
diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake
index af331821d..3aed9147f 100644
--- a/ports/entt/portfile.cmake
+++ b/ports/entt/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
         -DBUILD_TESTING=OFF
-- 
cgit v1.2.3