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

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

7 files changed, 22 insertions, 22 deletions

diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL
index 91d281589..a4db2f1e7 100644
--- a/ports/hypre/CONTROL
+++ b/ports/hypre/CONTROL
@@ -1,5 +1,5 @@
 Source: hypre
-Version: 2.11.2-2
+Version: 2.11.2-3
 Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods
 Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS
 Build-Depends: mpi
diff --git a/ports/hypre/fix-blas-vs14-math.patch b/ports/hypre/fix-blas-vs14-math.patch
index 7fd0cd6fe..424b16eb0 100644
--- a/ports/hypre/fix-blas-vs14-math.patch
+++ b/ports/hypre/fix-blas-vs14-math.patch
@@ -1,5 +1,5 @@
---- a/blas/f2c.h	Fri Sep 11 18:57:56 2015
-+++ b/blas/f2c.h	Thu Dec 22 18:20:08 2016
+--- a/src/blas/f2c.h	Fri Sep 11 18:57:56 2015
++++ b/src/blas/f2c.h	Thu Dec 22 18:20:08 2016
 @@ -190,18 +190,18 @@
  typedef struct Namelist Namelist;
  
diff --git a/ports/hypre/fix-export-global-data-symbols.patch b/ports/hypre/fix-export-global-data-symbols.patch
index 79231f532..2714e365a 100644
--- a/ports/hypre/fix-export-global-data-symbols.patch
+++ b/ports/hypre/fix-export-global-data-symbols.patch
@@ -1,5 +1,5 @@
---- a/utilities/_hypre_utilities.h	Thu Jun 09 15:56:18 2016
-+++ b/utilities/_hypre_utilities.h	Wed Jan 04 18:08:27 2017
+--- a/src/utilities/_hypre_utilities.h	Thu Jun 09 15:56:18 2016
++++ b/src/utilities/_hypre_utilities.h	Wed Jan 04 18:08:27 2017
 @@ -13,6 +13,7 @@
  #ifndef hypre_UTILITIES_HEADER
  #define hypre_UTILITIES_HEADER
diff --git a/ports/hypre/fix-lapack-vs14-math.patch b/ports/hypre/fix-lapack-vs14-math.patch
index 68d905742..7be84aeb6 100644
--- a/ports/hypre/fix-lapack-vs14-math.patch
+++ b/ports/hypre/fix-lapack-vs14-math.patch
@@ -1,5 +1,5 @@
---- a/lapack/f2c.h	Fri Sep 11 18:57:56 2015
-+++ b/lapack/f2c.h	Thu Dec 22 18:22:26 2016
+--- a/src/lapack/f2c.h	Fri Sep 11 18:57:56 2015
++++ b/src/lapack/f2c.h	Thu Dec 22 18:22:26 2016
 @@ -190,18 +190,18 @@
  typedef struct Namelist Namelist;
  
diff --git a/ports/hypre/fix-macro-to-template.patch b/ports/hypre/fix-macro-to-template.patch
index 22994f96a..ca98e5d70 100644
--- a/ports/hypre/fix-macro-to-template.patch
+++ b/ports/hypre/fix-macro-to-template.patch
@@ -1,5 +1,5 @@
---- a/struct_ls/pfmg3_setup_rap.c	Thu Jun 09 15:56:18 2016
-+++ b/struct_ls/pfmg3_setup_rap.c	Thu Dec 22 17:45:20 2016
+--- a/src/struct_ls/pfmg3_setup_rap.c	Thu Jun 09 15:56:18 2016
++++ b/src/struct_ls/pfmg3_setup_rap.c	Thu Dec 22 17:45:20 2016
 @@ -19,13 +19,28 @@
   * allow for coarsening to be done in the x- and y-directions also.
   *--------------------------------------------------------------------------*/
diff --git a/ports/hypre/fix-root-cmakelists.patch b/ports/hypre/fix-root-cmakelists.patch
index e69d6607e..b64914eb3 100644
--- a/ports/hypre/fix-root-cmakelists.patch
+++ b/ports/hypre/fix-root-cmakelists.patch
@@ -1,5 +1,5 @@
---- a/CMakeLists.txt	Mon Mar 13 21:37:24 2017
-+++ b/CMakeLists.txt	Sun Aug 06 19:34:00 2017
+--- a/src/CMakeLists.txt	Mon Mar 13 21:37:24 2017
++++ b/src/CMakeLists.txt	Sun Aug 06 19:34:00 2017
 @@ -1,6 +1,8 @@
  cmake_minimum_required (VERSION 2.8.8)
  project (hypre)
diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake
index f8ab07b9d..92dd78a0d 100644
--- a/ports/hypre/portfile.cmake
+++ b/ports/hypre/portfile.cmake
@@ -1,20 +1,20 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hypre-2.11.2/src)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.2.tar.gz"
     FILENAME "hypre-2.11.2.tar.gz"
     SHA512 a06321028121e5420fa944ce4fae5f9b96e6021ec2802e68ec3c349f19a20543ed7eff774a4735666c5807ce124eb571b3f86757c67e91faa1c683c3f657469f
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-root-cmakelists.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-macro-to-template.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-blas-vs14-math.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-lapack-vs14-math.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-export-global-data-symbols.patch
+        fix-root-cmakelists.patch
+        fix-macro-to-template.patch
+        fix-blas-vs14-math.patch
+        fix-lapack-vs14-math.patch
+        fix-export-global-data-symbols.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -24,7 +24,7 @@ else()
 endif()
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH ${SOURCE_PATH}/src
     PREFER_NINJA
     OPTIONS
         ${OPTIONS}
@@ -42,4 +42,4 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/../COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/hypre/copyright)
+file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/hypre/copyright)