port:llvm-1{3,4}: Add patch 0021-fix-find_dependency.patch to portfile. (#943)

* port:llvm-14: Add patch 0021-fix-find_dependency.patch to portfile.

* Add forgotten patch to llvm-13

* More complete LLVM 14 patch

Co-authored-by: Eric Kilmer <[email protected]>

Author: lkorenc

ports/llvm-13/portfile.cmake

@@ -18,6 +18,7 @@ vcpkg_from_github(
         0010-fix-libffi.patch
         0011-fix-libxml2.patch
         0020-fix-FindZ3.cmake.patch
+        0021-fix-find_dependency.patch
         0022-llvm-config-bin-path.patch
         0023-clang-sys-include-dir-path.patch
         0024-remove-elf_relocation-checks.patch

ports/llvm-13/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "llvm-13",
   "version": "13.0.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",

ports/llvm-14/0021-fix-find_dependency.patch

@@ -1,17 +1,33 @@
 diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
-index e1540ff316f7..9c8239094aca 100644
+index e1540ff316f7..8d7737d07218 100644
 --- a/llvm/cmake/modules/LLVMConfig.cmake.in
 +++ b/llvm/cmake/modules/LLVMConfig.cmake.in
-@@ -67,18 +67,22 @@ set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
+@@ -53,32 +53,35 @@ set(LLVM_ENABLE_EH @LLVM_ENABLE_EH@)
+ 
+ set(LLVM_ENABLE_FFI @LLVM_ENABLE_FFI@)
+ if(LLVM_ENABLE_FFI)
+-  find_package(FFI)
++  find_dependency(FFI)
+ endif()
+ 
+ set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@)
+ 
+ set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@)
+ if(LLVM_ENABLE_TERMINFO)
+-  find_package(Terminfo)
++  find_dependency(Terminfo)
+ endif()
+ 
+ set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
 
  set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
 
 +include(CMakeFindDependencyMacro)
  set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
  if(LLVM_ENABLE_ZLIB)
 -  set(ZLIB_ROOT @ZLIB_ROOT@)
+-  find_package(ZLIB)
 +  find_dependency(ZLIB)
-   find_package(ZLIB)
  endif()
 
  set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@)

ports/llvm-14/portfile.cmake

@@ -16,6 +16,7 @@ vcpkg_from_github(
         0010-fix-libffi.patch
         0011-fix-install-bolt.patch
         0020-fix-FindZ3.cmake.patch
+        0021-fix-find_dependency.patch
         0023-clang-sys-include-dir-path.patch
         0024-remove-elf_relocation-checks.patch
 )

ports/llvm-14/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "llvm-14",
   "version": "14.0.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp & !(arm & windows)",