[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

3 files changed, 3 insertions, 89 deletions

diff --git a/ports/msgpack/CONTROL b/ports/msgpack/CONTROL
index dab3515b9..1715eb780 100644
--- a/ports/msgpack/CONTROL
+++ b/ports/msgpack/CONTROL
@@ -1,4 +1,4 @@
 Source: msgpack
-Version: 3.2.0
+Version: 3.2.0-1
 Homepage: https://github.com/msgpack/msgpack-c
 Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.
diff --git a/ports/msgpack/add-static-lib-option.patch b/ports/msgpack/add-static-lib-option.patch
deleted file mode 100644
index 349a413fb..000000000
--- a/ports/msgpack/add-static-lib-option.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f92363e..b0becbb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -196,27 +196,28 @@ IF (MSGPACK_ENABLE_SHARED)
-             ${CMAKE_CURRENT_SOURCE_DIR}
-     )
- ENDIF ()
-+IF (MSGPACK_ENABLE_STATIC)
-+    ADD_LIBRARY (msgpackc-static STATIC
-+        ${msgpackc_SOURCES}
-+        ${msgpackc_HEADERS}
-+    )
- 
--ADD_LIBRARY (msgpackc-static STATIC
--    ${msgpackc_SOURCES}
--    ${msgpackc_HEADERS}
--)
--
--TARGET_INCLUDE_DIRECTORIES (msgpackc-static
--    PUBLIC
--        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
--        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
--        $<INSTALL_INTERFACE:include>
--    PRIVATE
--        ${CMAKE_CURRENT_SOURCE_DIR}
--)
-+    TARGET_INCLUDE_DIRECTORIES (msgpackc-static
-+        PUBLIC
-+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
-+            $<INSTALL_INTERFACE:include>
-+        PRIVATE
-+            ${CMAKE_CURRENT_SOURCE_DIR}
-+    )
-+    SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc" COMPILE_DEFINITIONS MSGPACK_DLLEXPORT=)
-+ENDIF ()
- 
--IF (NOT MSGPACK_ENABLE_SHARED)
-+IF (MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_SHARED)
-     # Add alias for subdirectories
-     ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
- ENDIF ()
- 
--SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
- IF (MSGPACK_ENABLE_SHARED)
-     IF (MSVC)
-         SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
-@@ -239,14 +240,18 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST
-     IF (MSGPACK_ENABLE_SHARED)
-         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
-     ENDIF ()
--    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
-+    IF (MSGPACK_ENABLE_STATIC)
-+        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
-+    ENDIF ()
- ENDIF ()
- 
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-     IF (MSGPACK_ENABLE_SHARED)
-         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-     ENDIF ()
--    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-+    IF (MSGPACK_ENABLE_STATIC)
-+        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
-+    ENDIF ()
- ENDIF ()
- 
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-@@ -278,10 +283,12 @@ IF (MSGPACK_BUILD_EXAMPLES)
-     ADD_SUBDIRECTORY (example)
- ENDIF ()
- 
--IF (MSGPACK_ENABLE_SHARED)
-+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-     SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
--ELSE()
-+ELSEIF (MSGPACK_ENABLE_STATIC)
-     SET (MSGPACK_INSTALLTARGETS msgpackc-static)
-+ELSE ()
-+    SET (MSGPACK_INSTALLTARGETS msgpackc)
- ENDIF ()
- 
- INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake
index c9249a2bc..b0939176c 100644
--- a/ports/msgpack/portfile.cmake
+++ b/ports/msgpack/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
     REPO msgpack/msgpack-c
     REF cpp-3.2.0
     SHA512 698fcdd5b427373997d0c89ff2cd09c44cf3b165defd381ff3cd9e14ecb83841064754a42aab99441a3b17aa26e3daec8f83e40d6d482c4b443b21b313278d14
-    HEAD_REF master)
-
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-static-lib-option.patch)
+    HEAD_REF master
+)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(MSGPACK_ENABLE_SHARED OFF)