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

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

6 files changed, 160 insertions, 154 deletions

diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index cdfd41eba..b48d97660 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,5 +1,5 @@
 Source: llvm
-Version: 8.0.0-2
+Version: 8.0.0-3
 Homepage: https://llvm.org/
 Description: The LLVM Compiler Infrastructure
 Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/fix-build-error.patch b/ports/llvm/fix-build-error.patch
index a311fb959..f48df44ac 100644
--- a/ports/llvm/fix-build-error.patch
+++ b/ports/llvm/fix-build-error.patch
@@ -1,7 +1,5 @@
-diff --git a/tools/clang/tools/libclang/CMakeLists.txt b/tools/clang/tools/libclang/CMakeLists.txt
-index e539c83..09c1ea3 100644
---- a/tools/clang/tools/libclang/CMakeLists.txt
-+++ b/tools/clang/tools/libclang/CMakeLists.txt
+--- a/tools/libclang/CMakeLists.txt
++++ b/tools/libclang/CMakeLists.txt
 @@ -56,10 +56,7 @@ if (TARGET clangTidyPlugin)
    endif()
  endif ()
diff --git a/ports/llvm/install-clang-modules-to-share.patch b/ports/llvm/install-clang-modules-to-share.patch
new file mode 100644
index 000000000..fa5eed84b
--- /dev/null
+++ b/ports/llvm/install-clang-modules-to-share.patch
@@ -0,0 +1,18 @@
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index be6d1d72..4749f64b 100644
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ # Generate a list of CMake library targets so that other CMake projects can
+ # link against them. LLVM calls its version of this file LLVMExports.cmake, but
+ # the usual CMake convention seems to be ${Project}Targets.cmake.
+-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
++set(CLANG_INSTALL_PACKAGE_DIR share/clang)
+ set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
+ 
+ # Keep this in sync with llvm/cmake/CMakeLists.txt!
+-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
++set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
diff --git a/ports/llvm/install-cmake-modules-to-share.patch b/ports/llvm/install-cmake-modules-to-share.patch
deleted file mode 100644
index 0e789377a..000000000
--- a/ports/llvm/install-cmake-modules-to-share.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN llvm-8.0.0.src-orig/cmake/modules/CMakeLists.txt llvm-8.0.0.src/cmake/modules/CMakeLists.txt
---- llvm-8.0.0.src-orig/cmake/modules/CMakeLists.txt	2018-07-27 13:57:51.000000000 +0300
-+++ llvm-8.0.0.src/cmake/modules/CMakeLists.txt	2019-03-26 14:56:34.645434190 +0200
-@@ -1,4 +1,4 @@
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- # First for users who use an installed LLVM, create the LLVMExports.cmake file.
-diff -urN llvm-8.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt llvm-8.0.0.src/tools/clang/cmake/modules/CMakeLists.txt
---- llvm-8.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt	2018-01-24 21:26:50.000000000 +0200
-+++ llvm-8.0.0.src/tools/clang/cmake/modules/CMakeLists.txt	2019-03-26 14:57:07.173362736 +0200
-@@ -1,11 +1,11 @@
- # Generate a list of CMake library targets so that other CMake projects can
- # link against them. LLVM calls its version of this file LLVMExports.cmake, but
- # the usual CMake convention seems to be ${Project}Targets.cmake.
--set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
-+set(CLANG_INSTALL_PACKAGE_DIR share/clang)
- set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
- 
- # Keep this in sync with llvm/cmake/CMakeLists.txt!
--set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
-+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
- 
- get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
diff --git a/ports/llvm/install-llvm-modules-to-share.patch b/ports/llvm/install-llvm-modules-to-share.patch
new file mode 100644
index 000000000..802cf183e
--- /dev/null
+++ b/ports/llvm/install-llvm-modules-to-share.patch
@@ -0,0 +1,10 @@
+diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+index f5cc0006..1d9c52ac 100644
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
++set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ # First for users who use an installed LLVM, create the LLVMExports.cmake file.
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index 67985d18c..1315f06ac 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -1,123 +1,129 @@
-# LLVM documentation recommends always using static library linkage when

-#   building with Microsoft toolchain; it's also the default on other platforms

-set(VCPKG_LIBRARY_LINKAGE static)

-

-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-    message(FATAL_ERROR "llvm cannot currently be built for UWP")

-endif()

-

-include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/llvm-8.0.0.src)

-vcpkg_download_distfile(ARCHIVE

-    URLS "http://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz"

-    FILENAME "llvm-8.0.0.src.tar.xz"

-    SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f

-)

-vcpkg_extract_source_archive(${ARCHIVE})

-

-vcpkg_download_distfile(CLANG_ARCHIVE

-    URLS "http://releases.llvm.org/8.0.0/cfe-8.0.0.src.tar.xz"

-    FILENAME "cfe-8.0.0.src.tar.xz"

-    SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3

-)

-vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools)

-

-if(NOT EXISTS ${SOURCE_PATH}/tools/clang)

-  file(RENAME ${SOURCE_PATH}/tools/cfe-8.0.0.src ${SOURCE_PATH}/tools/clang)

-endif()

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES 

-            install-cmake-modules-to-share.patch

-            fix-build-error.patch

-            fix-linux-build.patch

-)

-

-vcpkg_find_acquire_program(PYTHON3)

-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)

-set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS

-        -DLLVM_TARGETS_TO_BUILD=X86

-        -DLLVM_INCLUDE_TOOLS=ON

-        -DLLVM_INCLUDE_UTILS=OFF

-        -DLLVM_INCLUDE_EXAMPLES=OFF

-        -DLLVM_INCLUDE_TESTS=OFF

-        -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF

-        -DLLVM_TOOLS_INSTALL_DIR=tools/llvm

-        -DLLVM_PARALLEL_LINK_JOBS=1

-)

-

-vcpkg_install_cmake()

-

-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

-    file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*)

-    file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm)

-    file(REMOVE ${EXE})

-endif()

-

-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")

-    file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*)

-    file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm)

-    file(REMOVE ${DEBUG_EXE})

-endif()

-

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang)

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)

-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)

-

-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

-    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE)

-    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}")

-

-    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake RELEASE_MODULE)

-    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake "${RELEASE_MODULE}")

-endif()

-

-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")

-    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE)

-    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}")

-

-    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake DEBUG_MODULE)

-    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}")

-endif()

-

-if (EXISTS ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake)

-    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake LLVM_TOOLS_MODULE)

-    string(REPLACE "\${LLVM_INSTALL_PREFIX}/bin" "\${LLVM_INSTALL_PREFIX}/tools/llvm" LLVM_TOOLS_MODULE "${LLVM_TOOLS_MODULE}")

-    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake "${LLVM_TOOLS_MODULE}")

-endif()

-

-file(REMOVE_RECURSE

-    ${CURRENT_PACKAGES_DIR}/debug/include

-    ${CURRENT_PACKAGES_DIR}/debug/tools

-    ${CURRENT_PACKAGES_DIR}/debug/share

-    ${CURRENT_PACKAGES_DIR}/debug/bin

-    ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin

-    ${CURRENT_PACKAGES_DIR}/bin

-    ${CURRENT_PACKAGES_DIR}/msbuild-bin

-    ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin

-    ${CURRENT_PACKAGES_DIR}/include/llvm/BinaryFormat/WasmRelocs

-)

-

-# Remove two empty include subdirectorys if they are indeed empty

-file(GLOB MCANALYSISFILES ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis/*)

-if(NOT MCANALYSISFILES)

-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis)

-endif()

-

-file(GLOB MACHOFILES ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO/*)

-if(NOT MACHOFILES)

-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO)

-endif()

-

-# Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)

+include(vcpkg_common_functions)
+
+# LLVM documentation recommends always using static library linkage when
+# building with Microsoft toolchain; it's also the default on other platforms
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "llvm cannot currently be built for UWP")
+endif()
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz"
+    FILENAME "llvm-8.0.0.src.tar.xz"
+    SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+        install-llvm-modules-to-share.patch
+        fix-linux-build.patch
+)
+
+vcpkg_download_distfile(CLANG_ARCHIVE
+    URLS "http://releases.llvm.org/8.0.0/cfe-8.0.0.src.tar.xz"
+    FILENAME "cfe-8.0.0.src.tar.xz"
+    SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH CLANG_SOURCE_PATH
+    ARCHIVE ${CLANG_ARCHIVE}
+    PATCHES
+        fix-build-error.patch
+        install-clang-modules-to-share.patch
+)
+
+if(NOT EXISTS ${SOURCE_PATH}/tools/clang)
+  file(RENAME ${CLANG_SOURCE_PATH} ${SOURCE_PATH}/tools/clang)
+endif()
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DLLVM_TARGETS_TO_BUILD=X86
+        -DLLVM_INCLUDE_TOOLS=ON
+        -DLLVM_INCLUDE_UTILS=OFF
+        -DLLVM_INCLUDE_EXAMPLES=OFF
+        -DLLVM_INCLUDE_TESTS=OFF
+        -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF
+        -DLLVM_TOOLS_INSTALL_DIR=tools/llvm
+        -DLLVM_PARALLEL_LINK_JOBS=1
+)
+
+vcpkg_install_cmake()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*)
+    file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm)
+    file(REMOVE ${EXE})
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*)
+    file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm)
+    file(REMOVE ${DEBUG_EXE})
+endif()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake "${RELEASE_MODULE}")
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}")
+endif()
+
+if (EXISTS ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake)
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake LLVM_TOOLS_MODULE)
+    string(REPLACE "\${LLVM_INSTALL_PREFIX}/bin" "\${LLVM_INSTALL_PREFIX}/tools/llvm" LLVM_TOOLS_MODULE "${LLVM_TOOLS_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMConfig.cmake "${LLVM_TOOLS_MODULE}")
+endif()
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/tools
+    ${CURRENT_PACKAGES_DIR}/debug/share
+    ${CURRENT_PACKAGES_DIR}/debug/bin
+    ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin
+    ${CURRENT_PACKAGES_DIR}/bin
+    ${CURRENT_PACKAGES_DIR}/msbuild-bin
+    ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin
+    ${CURRENT_PACKAGES_DIR}/include/llvm/BinaryFormat/WasmRelocs
+)
+
+# Remove two empty include subdirectorys if they are indeed empty
+file(GLOB MCANALYSISFILES ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis/*)
+if(NOT MCANALYSISFILES)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis)
+endif()
+
+file(GLOB MACHOFILES ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO/*)
+if(NOT MACHOFILES)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/llvm/TextAPI/MachO)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)