From 52b430da562238579bc9cd17547fcf70d2fdb384 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 18 Dec 2023 10:13:26 +0300 Subject: [PATCH] clang: Fix regexp syntax in cmake module for ZSTD. --- mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch | 8 ++++++-- mingw-w64-clang/PKGBUILD | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch b/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch index 108fb0e6a2..f68fb5a29b 100644 --- a/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch +++ b/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch @@ -1,6 +1,6 @@ --- a/cmake/modules/Findzstd.cmake +++ b/cmake/modules/Findzstd.cmake -@@ -29,11 +29,11 @@ +@@ -29,14 +29,14 @@ ) if(zstd_FOUND) @@ -13,4 +13,8 @@ + if(WIN32) # IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library". get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY) - string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}") +- string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}") ++ string(REGEX REPLACE "\\${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}") + get_filename_component(zstd_BASENAME "${zstd_LIBRARY}" NAME) + string(REGEX REPLACE "\\${CMAKE_LINK_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}" zstd_BASENAME "${zstd_BASENAME}") + set_target_properties(zstd::libzstd_shared PROPERTIES diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index ae661c6214..bf9997678d 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -32,7 +32,7 @@ _version=17.0.6 _rc= _tag=llvmorg-${_version}${_rc} pkgver=${_version}${_rc/-/} -pkgrel=3 +pkgrel=4 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -91,7 +91,7 @@ sha256sums=('b638167da139126ca11917b6880207cc6e8f9d1cbb1a48d87d017f697ef78188' '3054d0a9c9375dab1a4539cc2cc45ab340341c5d71475f9599ba7752e222947b' 'SKIP' 'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff' - 'd7d58ad5d0e77f2803070a8fb7f4138a6f49a2cbf30c55ff059c31f40ca6b65c' + '70930739511f0934bafad518cd02acbccd03915ca4c6bec4b272eb5bcec33e1e' '7f0c64cd87b61e894be632f180ae5291e1aa9f1d9d382608f659067eeeda7146' '5f86e542dd1ec92b2fe06ee59061c3e23512df7bafabe82206f2b7d80b81836b' '715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'