[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, 30 insertions, 31 deletions

diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL
index 8dcd5af03..206837328 100644
--- a/ports/apr-util/CONTROL
+++ b/ports/apr-util/CONTROL
@@ -1,5 +1,5 @@
 Source: apr-util
-Version: 1.6.0-3
+Version: 1.6.0-5
 Homepage: https://apr.apache.org/
 Description: Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
 Build-Depends: expat, apr, openssl
diff --git a/ports/apr-util/apr.patch b/ports/apr-util/apr.patch
index 5a61cb9f9..581907fff 100644
--- a/ports/apr-util/apr.patch
+++ b/ports/apr-util/apr.patch
@@ -3,11 +3,11 @@ index 69e45541..19b86129 100644
 --- a/CMakeLists.txt	
 +++ b/CMakeLists.txt
 @@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
-   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")

- ENDIF()

- FOREACH(onelib ${APR_LIBRARIES})

--  IF(NOT EXISTS ${onelib})

-+  IF(${onelib} MATCHES "NOTFOUND")

-     MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")

-   ENDIF()

- ENDFOREACH()

+   MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+ ENDIF()
+ FOREACH(onelib ${APR_LIBRARIES})
+-  IF(NOT EXISTS ${onelib})
++  IF(${onelib} MATCHES "NOTFOUND")
+     MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+   ENDIF()
+ ENDFOREACH()
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake
index 0b1c28351..94a5ee053 100644
--- a/ports/apr-util/portfile.cmake
+++ b/ports/apr-util/portfile.cmake
@@ -1,37 +1,39 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-util-1.6.0)
+
 vcpkg_download_distfile(ARCHIVE
   URLS "https://archive.apache.org/dist/apr/apr-util-1.6.0-win32-src.zip"
   FILENAME "apr-util-1.6.0-win32-src.zip"
   SHA512 98679ea181d3132020713481703bbefa0c174e0b2a0df65dfdd176e9771935e1f9455c4242bac19dded9414abe2b9d293fcc674ab16f96d8987bcf26346fce3a
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
 
-vcpkg_apply_patches(
-  SOURCE_PATH ${SOURCE_PATH}
-  PATCHES 
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
         use-vcpkg-expat.patch
         apr.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_configure_cmake(
-      SOURCE_PATH ${SOURCE_PATH}
-      PREFER_NINJA
-      OPTIONS -DAPU_DECLARE_EXPORT=ON
-      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-    )
+  set(APU_DECLARE_EXPORT ON)
+  set(APU_DECLARE_STATIC OFF)
 else()
-    vcpkg_configure_cmake(
-      SOURCE_PATH ${SOURCE_PATH}
-      PREFER_NINJA
-      OPTIONS -DAPU_DECLARE_STATIC=ON
-      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-    )
+  set(APU_DECLARE_EXPORT OFF)
+  set(APU_DECLARE_STATIC ON)
 endif()
 
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    -DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT}
+    -DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC}
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=ON
+)
+
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 
 file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h  APU_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -41,7 +43,4 @@ else()
 endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")
 
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/apr-util RENAME copyright)
-
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)