diff --git a/ports/llvm-13/portfile.cmake b/ports/llvm-13/portfile.cmake index fa43ff01..e2efe823 100644 --- a/ports/llvm-13/portfile.cmake +++ b/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 diff --git a/ports/llvm-13/vcpkg.json b/ports/llvm-13/vcpkg.json index 4a97df16..e376ff39 100644 --- a/ports/llvm-13/vcpkg.json +++ b/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)", diff --git a/ports/llvm-14/0021-fix-find_dependency.patch b/ports/llvm-14/0021-fix-find_dependency.patch index 32c50b47..de0467f0 100644 --- a/ports/llvm-14/0021-fix-find_dependency.patch +++ b/ports/llvm-14/0021-fix-find_dependency.patch @@ -1,8 +1,24 @@ 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@) @@ -10,8 +26,8 @@ index e1540ff316f7..9c8239094aca 100644 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@) diff --git a/ports/llvm-14/portfile.cmake b/ports/llvm-14/portfile.cmake index 0c6fe6ff..7ded50f4 100644 --- a/ports/llvm-14/portfile.cmake +++ b/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 ) diff --git a/ports/llvm-14/vcpkg.json b/ports/llvm-14/vcpkg.json index 994b0b0b..70730f74 100644 --- a/ports/llvm-14/vcpkg.json +++ b/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)",