From 5b76887a11b1449a14a967587a9a9eafff07b4ef Mon Sep 17 00:00:00 2001 From: reito Date: Thu, 12 Jan 2023 15:24:44 +0800 Subject: [PATCH] update gas-preprocessor and clang in vcpkg_find_acquire_program (#28467) Co-authored-by: Cheney-Wang <850426846@qq.com> Co-authored-by: FrankXie --- scripts/cmake/vcpkg_find_acquire_program.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 83d729b7a9..8e8da0b98f 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -385,8 +385,8 @@ function(vcpkg_find_acquire_program program) endif() elseif(program STREQUAL "CLANG") set(program_name clang) - set(tool_subdirectory "clang-12.0.0") - set(program_version 12.0.0) + set(tool_subdirectory "clang-15.0.6") + set(program_version 15.0.6) if(CMAKE_HOST_WIN32) set(paths_to_search # Support LLVM in Visual Studio 2019 @@ -406,11 +406,11 @@ function(vcpkg_find_acquire_program program) if(host_arch MATCHES "64") set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe") set(download_filename "LLVM-${program_version}-win64.7z.exe") - set(download_sha512 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f) + set(download_sha512 2dd6f3eea106f2b905e6658ea5ea12856d17285adbfba055edc2d6b6389c4c2f7aa001df5cb0d8fb84fa7fa47d5035a7fddf276523b472dd55f150ae25938768) else() set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe") set(download_filename "LLVM-${program_version}-win32.7z.exe") - set(download_sha512 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199) + set(download_sha512 90225D650EADB0E590A9912B479B46A575D41A19EB5F2DA03C4DC8B032DC0790222F0E3706DFE2A35C0E7747941972AC26CB47D3EB13730DB76168931F37E5F1) endif() endif() set(brew_package_name "llvm") @@ -425,14 +425,15 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "GASPREPROCESSOR") set(raw_executable true) set(program_name gas-preprocessor) - set(tool_subdirectory "4daa6115") set(interpreter PERL) set(search_names "gas-preprocessor.pl") set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}") set(rename_binary_to "gas-preprocessor.pl") - set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/4daa611556a0558dfe537b4f7ad80f7e50a079c1/gas-preprocessor.pl") + set(commit_id 9309c67acb535ca6248f092e96131d8eb07eefc1) + set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/${commit_id}/gas-preprocessor.pl") + string(SUBSTRING ${commit_id} 0 8 tool_subdirectory) set(download_filename "gas-preprocessor-${tool_subdirectory}.pl") - set(download_sha512 2737ba3c1cf85faeb1fbfe015f7bad170f43a857a50a1b3d81fa93ba325d481f73f271c5a886ff8b7eef206662e19f0e9ef24861dfc608b67b8ea8a2062dc061) + set(download_sha512 b4749cf8aa758e3f28d4b21803422a5c2588f5fc48cfd317564606b374f8d739c636067cf7a4956d7365d63b055bc6e7626c304857e6c9013d6b4a0db9d8ad4f) elseif(program STREQUAL "DARK") set(program_name dark) set(tool_subdirectory "wix311-binaries")