LLVM 15 Update to 15.0.3 and latest vcpkg tag (#982)

lifting-bits · Oct 25, 2022 · 9feefef · 9feefef
1 parent c526ec0
commit 9feefef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/ports/llvm-15/0021-fix-find_dependency.patch b/ports/llvm-15/0021-fix-find_dependency.patch
@@ -1,5 +1,5 @@
 diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
-index fbf28d36bedf..a9a5b83852b5 100644
+index f1362fa032c2..a9a5b83852b5 100644
 --- a/llvm/cmake/modules/LLVMConfig.cmake.in
 +++ b/llvm/cmake/modules/LLVMConfig.cmake.in
 @@ -51,16 +51,18 @@ set(LLVM_ENABLE_ASSERTIONS @LLVM_ENABLE_ASSERTIONS@)
@@ -23,7 +23,7 @@ index fbf28d36bedf..a9a5b83852b5 100644
  endif()
 
  set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
-@@ -69,22 +71,23 @@ set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
+@@ -69,21 +71,23 @@ set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
 
  set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
  if(LLVM_ENABLE_ZLIB)
@@ -34,7 +34,6 @@ index fbf28d36bedf..a9a5b83852b5 100644
 
  set(LLVM_ENABLE_ZSTD @LLVM_ENABLE_ZSTD@)
  if(LLVM_ENABLE_ZSTD)
--  set(zstd_ROOT @zstd_ROOT@)
 -  find_package(zstd)
 +  find_dependency(zstd)
  endif()

diff --git a/ports/llvm-15/portfile.cmake b/ports/llvm-15/portfile.cmake
@@ -1,12 +1,12 @@
-set(LLVM_VERSION "15.0.1")
+set(LLVM_VERSION "15.0.3")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llvm/llvm-project
     REF llvmorg-${LLVM_VERSION}
-    SHA512 d518de4860bd953c4728f00cb52aba37e1e8c2a0825b0a6cc046494f2ad4d1e1d07d36524c2aca87c7f27a5c07c21cdcf18ac73a03c2eed813ca46d24f31f445
+    SHA512 0d52d96222db159bf77261d2525c59f1605b29ab899a986114c706b77508f62742b07228f6877ab2fca43e2e71697317f0779f6a4a679db74242889ee6110441
     HEAD_REF main
     PATCHES
         0001-Fix-install-paths.patch    # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc.

diff --git a/ports/llvm-15/vcpkg.json b/ports/llvm-15/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "llvm-15",
-  "version": "15.0.1",
-  "port-version": 1,
+  "version": "15.0.3",
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "license": "Apache-2.0",

diff --git a/vcpkg_info.txt b/vcpkg_info.txt
@@ -1,2 +1,2 @@
 https://github.com/microsoft/vcpkg.git
-6ca56aeb457f033d344a7106cb3f9f1abf8f4e98
+2022.10.19