From e3ca66d349225a4e282e4171590be095c1c0d962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sun, 7 Sep 2025 16:16:01 +0100 Subject: [PATCH] LLVM: update to 21.1.1 --- ...d-double-bessel-functions-on-windows.patch | 26 ---- .../0004-do-not-define-pid_t-on-mingw.patch | 33 ------ .../0007-add-municode-flag-on-mingw.patch | 14 --- .../0101-add-municode-flag-on-mingw.patch | 13 ++ ...2-do-not-use-clock_gettime-on-mingw.patch} | 6 +- mingw-w64-flang/0103-fix-build-on-mingw.patch | 21 ++++ mingw-w64-flang/PKGBUILD | 112 +++++++++++++----- mingw-w64-libc++/PKGBUILD | 4 +- .../0002-fix-pkgconfig-file.patch | 4 +- mingw-w64-libclc/PKGBUILD | 6 +- .../001-fix-build-with-mingw-w64-gcc.patch | 11 ++ mingw-w64-lldb/PKGBUILD | 18 +-- mingw-w64-llvm-openmp/PKGBUILD | 6 +- .../0002-Fix-Findzstd-on-MINGW.patch | 16 +-- mingw-w64-llvm/PKGBUILD | 26 ++-- mingw-w64-mlir/PKGBUILD | 6 +- mingw-w64-polly/PKGBUILD | 6 +- 17 files changed, 177 insertions(+), 151 deletions(-) delete mode 100644 mingw-w64-flang/0001-fold-double-bessel-functions-on-windows.patch delete mode 100644 mingw-w64-flang/0004-do-not-define-pid_t-on-mingw.patch delete mode 100644 mingw-w64-flang/0007-add-municode-flag-on-mingw.patch create mode 100644 mingw-w64-flang/0101-add-municode-flag-on-mingw.patch rename mingw-w64-flang/{0008-do-not-use-clock_gettime-on-mingw.patch => 0102-do-not-use-clock_gettime-on-mingw.patch} (76%) create mode 100644 mingw-w64-flang/0103-fix-build-on-mingw.patch create mode 100644 mingw-w64-lldb/001-fix-build-with-mingw-w64-gcc.patch diff --git a/mingw-w64-flang/0001-fold-double-bessel-functions-on-windows.patch b/mingw-w64-flang/0001-fold-double-bessel-functions-on-windows.patch deleted file mode 100644 index f9b0ad5511..0000000000 --- a/mingw-w64-flang/0001-fold-double-bessel-functions-on-windows.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/lib/Evaluate/intrinsics-library.cpp -+++ b/lib/Evaluate/intrinsics-library.cpp -@@ -413,6 +413,23 @@ - }; - #endif // LDBL_MANT_DIG == 80 || LDBL_MANT_DIG == 113 - #endif //_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 -+ -+#ifdef _WIN32 -+template <> struct HostRuntimeLibrary { -+ using F = FuncPointer; -+ using FN = FuncPointer; -+ static constexpr HostRuntimeFunction table[]{ -+ FolderFactory::Create("bessel_j0"), -+ FolderFactory::Create("bessel_j1"), -+ FolderFactory::Create("bessel_jn"), -+ FolderFactory::Create("bessel_y0"), -+ FolderFactory::Create("bessel_y1"), -+ FolderFactory::Create("bessel_yn"), -+ }; -+ static constexpr HostRuntimeMap map{table}; -+ static_assert(map.Verify(), "map must be sorted"); -+}; -+#endif - - /// Define pgmath description - #if LINK_WITH_LIBPGMATH diff --git a/mingw-w64-flang/0004-do-not-define-pid_t-on-mingw.patch b/mingw-w64-flang/0004-do-not-define-pid_t-on-mingw.patch deleted file mode 100644 index 1c17ab78c2..0000000000 --- a/mingw-w64-flang/0004-do-not-define-pid_t-on-mingw.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/include/flang/Optimizer/Builder/Runtime/RTBuilder.h -+++ b/include/flang/Optimizer/Builder/Runtime/RTBuilder.h -@@ -29,7 +29,7 @@ - #include - #include - --#ifdef _WIN32 -+#ifdef _MSC_VER - // On Windows* OS GetCurrentProcessId returns DWORD aka uint32_t - typedef std::uint32_t pid_t; - #endif ---- a/include/flang/Runtime/command.h -+++ b/include/flang/Runtime/command.h -@@ -12,7 +12,7 @@ - #include "flang/Runtime/entry-names.h" - #include - --#ifdef _WIN32 -+#ifdef _MSC_VER - // On Windows* OS GetCurrentProcessId returns DWORD aka uint32_t - typedef std::uint32_t pid_t; - #else ---- a/runtime/command.cpp -+++ b/runtime/command.cpp -@@ -15,7 +15,7 @@ - #include - #include - --#ifdef _WIN32 -+#ifdef _MSC_VER - #include "flang/Common/windows-include.h" - #include - #define getcwd _getcwd diff --git a/mingw-w64-flang/0007-add-municode-flag-on-mingw.patch b/mingw-w64-flang/0007-add-municode-flag-on-mingw.patch deleted file mode 100644 index 629f840238..0000000000 --- a/mingw-w64-flang/0007-add-municode-flag-on-mingw.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -76,6 +76,11 @@ - - append(${NO_LTO_FLAGS} CMAKE_C_FLAGS) - append(${NO_LTO_FLAGS} CMAKE_CXX_FLAGS) -+ -+if (MINGW) -+ append("-municode" CMAKE_C_FLAGS) -+ append("-municode" CMAKE_CXX_FLAGS) -+endif() - - # Disable libstdc++/libc++ assertions, even in an LLVM_ENABLE_ASSERTIONS build, - # to avoid an unwanted dependency on libstdc++/libc++.so. diff --git a/mingw-w64-flang/0101-add-municode-flag-on-mingw.patch b/mingw-w64-flang/0101-add-municode-flag-on-mingw.patch new file mode 100644 index 0000000000..2579c0d5f4 --- /dev/null +++ b/mingw-w64-flang/0101-add-municode-flag-on-mingw.patch @@ -0,0 +1,13 @@ +--- a/lib/runtime/CMakeLists.txt ++++ b/lib/runtime/CMakeLists.txt +@@ -225,6 +225,10 @@ + set(sources ${supported_sources} ${host_sources} ${f128_sources}) + endif () + ++if (MINGW) ++ string(APPEND CMAKE_C_FLAGS " -municode") ++ string(APPEND CMAKE_CXX_FLAGS " -municode") ++endif() + + if (NOT WIN32) + add_flangrt_library(flang_rt.runtime STATIC SHARED diff --git a/mingw-w64-flang/0008-do-not-use-clock_gettime-on-mingw.patch b/mingw-w64-flang/0102-do-not-use-clock_gettime-on-mingw.patch similarity index 76% rename from mingw-w64-flang/0008-do-not-use-clock_gettime-on-mingw.patch rename to mingw-w64-flang/0102-do-not-use-clock_gettime-on-mingw.patch index 29b631229f..6ae9257416 100644 --- a/mingw-w64-flang/0008-do-not-use-clock_gettime-on-mingw.patch +++ b/mingw-w64-flang/0102-do-not-use-clock_gettime-on-mingw.patch @@ -1,6 +1,6 @@ ---- a/runtime/random.cpp -+++ b/runtime/random.cpp -@@ -100,7 +100,7 @@ +--- a/lib/runtime/random.cpp ++++ b/lib/runtime/random.cpp +@@ -39,7 +39,7 @@ if (repeatable) { generator.seed(0); } else { diff --git a/mingw-w64-flang/0103-fix-build-on-mingw.patch b/mingw-w64-flang/0103-fix-build-on-mingw.patch new file mode 100644 index 0000000000..ec0f74d40d --- /dev/null +++ b/mingw-w64-flang/0103-fix-build-on-mingw.patch @@ -0,0 +1,21 @@ +--- a/lib/runtime/CMakeLists.txt ++++ b/lib/runtime/CMakeLists.txt +@@ -182,7 +182,7 @@ + endif () + + +-if (NOT WIN32) ++if (NOT MSVC) + add_flangrt_library(flang_rt.runtime STATIC SHARED + ${sources} + LINK_LIBRARIES ${Backtrace_LIBRARY} +--- a/lib/runtime/command.cpp ++++ b/lib/runtime/command.cpp +@@ -19,6 +19,7 @@ + #ifdef _WIN32 + #include "flang/Common/windows-include.h" + #include ++#include + #define getcwd _getcwd + #define unlink _unlink + #define PATH_MAX MAX_PATH diff --git a/mingw-w64-flang/PKGBUILD b/mingw-w64-flang/PKGBUILD index cfb8e280e4..b464a25e18 100644 --- a/mingw-w64-flang/PKGBUILD +++ b/mingw-w64-flang/PKGBUILD @@ -4,8 +4,9 @@ _compiler=clang _realname=flang pkgbase=mingw-w64-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=20.1.8 +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" + "${MINGW_PACKAGE_PREFIX}-${_realname}-rt") +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 pkgdesc="Fortran frontend for LLVM (mingw-w64)" @@ -18,46 +19,41 @@ msys2_references=( "gentoo: " ) license=("spdx:Apache-2.0 WITH LLVM-exception") -provides=($([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc")) depends=("${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-llvm" "${MINGW_PACKAGE_PREFIX}-mlir") makedepends=("${MINGW_PACKAGE_PREFIX}-clang-tools-extra" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-lld" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-pkgconf" + "${MINGW_PACKAGE_PREFIX}-python" "gawk" $([[ "$_compiler" == "clang" ]] && echo \ + "${MINGW_PACKAGE_PREFIX}-lld" \ "${MINGW_PACKAGE_PREFIX}-compiler-rt" \ "${MINGW_PACKAGE_PREFIX}-libc++") $([[ "$_compiler" == "gcc" ]] && echo \ "${MINGW_PACKAGE_PREFIX}-gcc") ) -optdepends=("${MINGW_PACKAGE_PREFIX}-llvm-openmp") -_pkgfn=${_realname}-${_pkgver}.src +_pkgfn=llvm-project-${_pkgver}.src _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver} source=("${_url}/${_pkgfn}.tar.xz"{,.sig} - "${_url}/cmake-${_pkgver}.src.tar.xz"{,.sig} - "0001-fold-double-bessel-functions-on-windows.patch" "0002-cmake-22162.patch" - "0004-do-not-define-pid_t-on-mingw.patch" "0005-Fix-c_long_double-value-on-mingw-aarch64.patch" - "0007-add-municode-flag-on-mingw.patch" - "0008-do-not-use-clock_gettime-on-mingw.patch") -sha256sums=('44296078f6fabba33e7eae45928e6e3d556502e1dbf30ed68295e6f3e128acae' + "0101-add-municode-flag-on-mingw.patch" + "0102-do-not-use-clock_gettime-on-mingw.patch" + "0103-fix-build-on-mingw.patch") +sha256sums=('8863980e14484a72a9b7d2c80500e1749054d74f08f8c5102fd540a3c5ac9f8a' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' - 'SKIP' - 'ae666c454909f6695bcd69f067b9c5abf8a6e82ce2930955b8598ab3b58a5204' '77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895' - '90bec8f2a9a8d62b57959722f3b15a54dfdaf24e0a5ea884bf6b1288d0853be8' 'a1811227e2a26c2786b0c8577528580e679111f6c0889afea57d08333e2d5e4f' - '45f8da68b2cb48c85db7099e174e7eebeabe90207a23ff19c7fe1e7f1f8541d8' - 'be1265d4922f45cc4e7ec6a80247baba8b1e648e1e514718ebd1004958bae967') + 'cb7c7f8f00076c904263a1aeb1bdd68625f18b2d0246adb6f38588cd6e1c9d09' + '215941eb952b3bc054d5f21e4db06d13aca44fb18f7a7800eb1d3e89cf9845da' + 'f4efcbd6baf9d26652b0111dafd5686a03ff167b466b5d84da94965d56ff2f4e') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta +noextract=("llvm-project-${_pkgver}.src.tar.xz") apply_patch_with_msg() { for _patch in "$@" @@ -68,17 +64,23 @@ apply_patch_with_msg() { } prepare() { - [[ -d ./cmake ]] && rm -rf ./cmake - mv cmake-${_pkgver}.src cmake - cd "${srcdir}/flang-${_pkgver}.src" + plain "Extracting llvm-project-${_pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)" + tar -xJf "${srcdir}"/llvm-project-${_pkgver}.src.tar.xz -C "${srcdir}" || true + + # Patch flang + cd "${srcdir}"/llvm-project-${_pkgver}.src/flang apply_patch_with_msg \ - "0001-fold-double-bessel-functions-on-windows.patch" \ "0002-cmake-22162.patch" \ - "0004-do-not-define-pid_t-on-mingw.patch" \ - "0005-Fix-c_long_double-value-on-mingw-aarch64.patch" \ - "0007-add-municode-flag-on-mingw.patch" \ - "0008-do-not-use-clock_gettime-on-mingw.patch" + "0005-Fix-c_long_double-value-on-mingw-aarch64.patch" + + # Patch flang-rt + cd "${srcdir}"/llvm-project-${_pkgver}.src/flang-rt + + apply_patch_with_msg \ + "0101-add-municode-flag-on-mingw.patch" \ + "0102-do-not-use-clock_gettime-on-mingw.patch" \ + "0103-fix-build-on-mingw.patch" } build() { @@ -102,6 +104,7 @@ build() { -GNinja \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib \ + -DBUILD_SHARED_LIBS=OFF \ -DLLVM_HOST_TRIPLE="${CARCH}-w64-windows-gnu" \ -DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_THREADS=ON \ @@ -112,7 +115,26 @@ build() { -DFLANG_INCLUDE_TESTS=OFF \ "${_extra_config[@]}" \ -Wno-dev \ - ../${_pkgfn} + ../${_pkgfn}/flang + + ${MINGW_PREFIX}/bin/cmake.exe --build . + + mkdir -p "${srcdir}"/build-${MSYSTEM}-rt && cd "${srcdir}"/build-${MSYSTEM}-rt + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib \ + -DCMAKE_Fortran_COMPILER="${srcdir}"/build-${MSYSTEM}/bin/flang.exe \ + -DCMAKE_Fortran_COMPILER_WORKS=ON \ + -DLLVM_HOST_TRIPLE="${CARCH}-w64-windows-gnu" \ + -DLLVM_ENABLE_RUNTIMES="flang-rt" \ + -DFLANG_RT_INCLUDE_TESTS=OFF \ + -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \ + "${_extra_config[@]}" \ + -Wno-dev \ + ../${_pkgfn}/runtimes ${MINGW_PREFIX}/bin/cmake.exe --build . } @@ -124,8 +146,40 @@ check() { ${MINGW_PREFIX}/bin/cmake.exe --build . -- check-flang || true } -package() { +package_flang() { + pkgdesc="Fortran frontend for LLVM (Compiler) (mingw-w64)" + depends+=("${MINGW_PACKAGE_PREFIX}-flang-rt") + optdepends=("${MINGW_PACKAGE_PREFIX}-llvm-openmp") + provides=($([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc")) + DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM} - install -Dm644 "${srcdir}"/${_pkgfn}/LICENSE.TXT "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE + install -Dm644 "${srcdir}"/${_pkgfn}/${_realname}/LICENSE.TXT \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE } + +package_flang-rt() { + pkgdesc="Fortran frontend for LLVM (Runtime) (mingw-w64)" + depends=() + #provides=($([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc-libs")) + + DESTDIR="${pkgdir}" cmake --install build-${MSYSTEM}-rt + + mkdir -p lib + cp "${pkgdir}"${MINGW_PREFIX}/lib/clang/${pkgver%.[0-9].*}/lib/${CARCH}-w64-windows-gnu/libflang_rt.runtime.static.a \ + "${pkgdir}"${MINGW_PREFIX}/lib/libflang_rt.runtime.a + + install -Dm644 "${srcdir}"/${_pkgfn}/${_realname}-rt/LICENSE.TXT \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}-rt/LICENSE +} + +# template start; name=mingw-w64-splitpkg-wrappers; version=1.0; +# vim: set ft=bash : + +# generate wrappers +for _name in "${pkgname[@]}"; do + _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}" + _func="$(declare -f "${_short}")" + eval "${_func/#${_short}/package_${_name}}" +done +# template end; diff --git a/mingw-w64-libc++/PKGBUILD b/mingw-w64-libc++/PKGBUILD index 709c96091f..64f4e2a396 100644 --- a/mingw-w64-libc++/PKGBUILD +++ b/mingw-w64-libc++/PKGBUILD @@ -8,7 +8,7 @@ _realname=libc++ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-libunwind") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 arch=(any) @@ -32,7 +32,7 @@ if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then fi _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver} source=("${_url}/llvm-project-${_pkgver}.src.tar.xz"{,.sig}) -sha256sums=('6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d' +sha256sums=('8863980e14484a72a9b7d2c80500e1749054d74f08f8c5102fd540a3c5ac9f8a' 'SKIP') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard diff --git a/mingw-w64-libclc/0002-fix-pkgconfig-file.patch b/mingw-w64-libclc/0002-fix-pkgconfig-file.patch index 7807af3c5a..e255cd7cf2 100644 --- a/mingw-w64-libclc/0002-fix-pkgconfig-file.patch +++ b/mingw-w64-libclc/0002-fix-pkgconfig-file.patch @@ -1,10 +1,8 @@ --- a/libclc.pc.in +++ b/libclc.pc.in -@@ -1,5 +1,6 @@ --includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ +@@ -1,4 +1,5 @@ -libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc +prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libexecdir=${prefix}/@CMAKE_INSTALL_DATADIR@/clc Name: libclc diff --git a/mingw-w64-libclc/PKGBUILD b/mingw-w64-libclc/PKGBUILD index 99892c0ea8..6929cc45fc 100644 --- a/mingw-w64-libclc/PKGBUILD +++ b/mingw-w64-libclc/PKGBUILD @@ -3,7 +3,7 @@ _realname=libclc pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 pkgdesc='Library requirements of the OpenCL C programming language (mingw-w64)' @@ -22,10 +22,10 @@ _pkgfn=${_realname}-${_pkgver}.src source=($_url/$_pkgfn.tar.xz{,.sig} 0001-cmake-copy-instead-symlink.patch 0002-fix-pkgconfig-file.patch) -sha256sums=('ecd83a52859742f71f4c332538f8bee54a6743374a233b5a85017de22d75c227' +sha256sums=('eed2926f2b981c10800573de3eded1ba41de0951f93f6d7c574c0896b4b1c816' 'SKIP' 'b974a117ec1a658ec529f271960ff10cedc3eb0636f3f0d6773a89934a7d1e90' - 'f0c995d679214dbb1248f15365c6d26440efa0afc76402172068456f99109c25') + '3b1b825d9b2dae860f1ed0e832f58da8fa469a118544cca0d6ef4751dacfdde3') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta diff --git a/mingw-w64-lldb/001-fix-build-with-mingw-w64-gcc.patch b/mingw-w64-lldb/001-fix-build-with-mingw-w64-gcc.patch new file mode 100644 index 0000000000..7dd7780094 --- /dev/null +++ b/mingw-w64-lldb/001-fix-build-with-mingw-w64-gcc.patch @@ -0,0 +1,11 @@ +--- a/source/Host/windows/MainLoopWindows.cpp ++++ b/source/Host/windows/MainLoopWindows.cpp +@@ -58,7 +58,7 @@ + // Keep trying to cancel ReadFile() until the thread exits. + do { + CancelIoEx(m_handle, /*lpOverlapped=*/NULL); +- } while (WaitForSingleObject(m_monitor_thread.native_handle(), 1) == ++ } while (WaitForSingleObject(reinterpret_cast(m_monitor_thread.native_handle()), 1) == + WAIT_TIMEOUT); + m_monitor_thread.join(); + } diff --git a/mingw-w64-lldb/PKGBUILD b/mingw-w64-lldb/PKGBUILD index 1a1f29ffbf..845158609c 100644 --- a/mingw-w64-lldb/PKGBUILD +++ b/mingw-w64-lldb/PKGBUILD @@ -7,9 +7,9 @@ fi _realname=lldb pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} -pkgrel=2 +pkgrel=1 pkgdesc="Next generation, high-performance debugger (mingw-w64)" url="https://lldb.llvm.org/" msys2_references=( @@ -35,11 +35,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver} _pkgfn=${_realname}-${_pkgver}.src source=($_url/$_pkgfn.tar.xz{,.sig} - ${_url}/cmake-${_pkgver}.src.tar.xz{,.sig}) -sha256sums=('244cc34ef3d342f02f26c26f1afeb62a9df2ab0178b1baf2077fa43ecdd3186f' + ${_url}/cmake-${_pkgver}.src.tar.xz{,.sig} + 001-fix-build-with-mingw-w64-gcc.patch) +sha256sums=('6e3e56b4fecf143a7c1e9b84e32bee475d599e80a6ec7b0f7ab89962056ec07e' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' - 'SKIP') + '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769' + 'SKIP' + '6eb85bb0076210ba6922d68d97e1210716b133f2ea26a1cf267135b73b6cb556') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta @@ -48,13 +50,15 @@ apply_patch_with_msg() { for _patch in "$@" do msg2 "Applying ${_patch}" - patch -Nbp2 -i "${srcdir}/${_patch}" + patch -Nbp1 -i "${srcdir}/${_patch}" done } prepare() { mv cmake-${_pkgver}.src cmake cd "${srcdir}"/$_pkgfn + apply_patch_with_msg \ + 001-fix-build-with-mingw-w64-gcc.patch } build() { diff --git a/mingw-w64-llvm-openmp/PKGBUILD b/mingw-w64-llvm-openmp/PKGBUILD index 1bc80cdeda..43d69533ce 100644 --- a/mingw-w64-llvm-openmp/PKGBUILD +++ b/mingw-w64-llvm-openmp/PKGBUILD @@ -7,7 +7,7 @@ fi _realname=openmp pkgbase=mingw-w64-llvm-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-llvm-${_realname}") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 pkgdesc="LLVM OpenMP Library (mingw-w64)" @@ -36,9 +36,9 @@ source=($_url/$_pkgfn.tar.xz{,.sig} ${_url}/cmake-${pkgver}.src.tar.xz{,.sig} "001-cast-to-make-gcc-happy.patch" "002-hacks-for-static-linking.patch") -sha256sums=('b21c04ee9cbe56e200c5d83823765a443ee6389bbc3f64154c96e94016e6cee9' +sha256sums=('eb10379045844c2d2f1b89a15fd1beaf9cd0de524180c6648e9ea17a0661ece2' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' + '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769' 'SKIP' '11352ffbe7559a7170f2abd52b3552c877fbcf8fc82cff77b421e8b130a4dd66' '08e39ea52a99204528740196a13cc29daf1b65a6e230fbd7bdd745dde5d11ef3') diff --git a/mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch b/mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch index 5e94177bee..44ef6a62be 100644 --- a/mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch +++ b/mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch @@ -1,5 +1,5 @@ ---- llvm/cmake/modules/Findzstd.cmake.orig 2024-09-17 13:26:36.000000000 +0200 -+++ llvm/cmake/modules/Findzstd.cmake 2024-09-29 13:19:16.980962300 +0200 +--- a/cmake/modules/Findzstd.cmake ++++ b/cmake/modules/Findzstd.cmake @@ -16,6 +16,8 @@ set(zstd_STATIC_LIBRARY_SUFFIX "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$") endif() @@ -9,21 +9,15 @@ find_path(zstd_INCLUDE_DIR NAMES zstd.h) find_library(zstd_LIBRARY NAMES zstd zstd_static) find_library(zstd_STATIC_LIBRARY NAMES -@@ -27,17 +29,18 @@ +@@ -27,6 +27,7 @@ zstd DEFAULT_MSG zstd_LIBRARY zstd_INCLUDE_DIR ) +endif() if(zstd_FOUND) -- if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$") -+ if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$" AND NOT MINGW) - set(zstd_STATIC_LIBRARY "${zstd_LIBRARY}") - elseif (NOT TARGET zstd::libzstd_shared) - add_library(zstd::libzstd_shared SHARED IMPORTED) -- if(MSVC OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") -+ if(WIN32) - include(GNUInstallDirs) # For CMAKE_INSTALL_LIBDIR and friends. + if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$" AND NOT zstd_LIBRARY MATCHES "\\.dll\\.a$") +@@ -38,7 +39,7 @@ # IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library". get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY) if(NOT "${CMAKE_INSTALL_LIBDIR}" STREQUAL "" AND NOT "${CMAKE_INSTALL_BINDIR}" STREQUAL "") diff --git a/mingw-w64-llvm/PKGBUILD b/mingw-w64-llvm/PKGBUILD index 0e760c00f0..66b0759b20 100644 --- a/mingw-w64-llvm/PKGBUILD +++ b/mingw-w64-llvm/PKGBUILD @@ -27,9 +27,9 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-llvm" "${MINGW_PACKAGE_PREFIX}-compiler-rt" $( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-gcc-compat" ) "${MINGW_PACKAGE_PREFIX}-lld") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} -pkgrel=2 +pkgrel=1 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -76,22 +76,22 @@ source=("${_url}/llvm-${_pkgver}.src.tar.xz"{,.sig} # 0401-0499 -> clang-tools-extra # 0901-0999 -> whole tree ) -sha256sums=('e1363888216b455184dbb8a74a347bf5612f56a3f982369e1cba6c7e0726cde1' +sha256sums=('23336f9f2290f2317121a5995e298a4616041ba06cbb07cfd1220a21b48775fe' 'SKIP' - 'b7a1b7b0af7b9c7596af6bd46e36d11321926eaa66a7a7dc957ab0a1375ee4b0' + '65a19a75440c6d0f92138d82432e7a201677fad5cecf39d3200eaa2f458c29e3' 'SKIP' - '7d5ce15f84a098d79b5369d3c03857065abc3cb2f3435f08b1e4bc2a829aa2fc' + '80de2f8a4d1b2d555eb5476b5b6b85f9219d7da9ae25795521f4133ebdd5606b' 'SKIP' - '15277402f6fd63397c0917a5c7171cda82d16d226094b828c1ed0f58f73b9c69' + 'f5e46d1734be28bc8ea83d0a5621a43388d349def91e37e6907609e5b67d1f8e' 'SKIP' - '8281462d62cae67dfe5fdbb4da0d82bc62e0a86d4d4f758b0b601d44f09fd987' + '5e83536d8197ba38f40b8c4fbdeef7315a7dc15ed894a7b837a9a3482b9f80ef' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' + '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769' 'SKIP' - '9a4e452a8163732d417db067a89190fcda823cb3aa33199e834ac7c028923f4b' + 'e9b7299b0b32aa827231ed35101a3b5ea37dd5a45719225cb2c08ac571791233' 'SKIP' 'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff' - '7cdf15c7e9c13ab99c42b4fafb15d871b22558f751729bb7173ce3edeffc8db8' + 'd77d47e37e4948f5c01ae8bc05fb4e879b6516132c5a60c7bc820c9cbbb39668' '790eb0fccb4ef29c3795bceb8a62c8f4ecd0bdd6c49b2812352b04cfbc552342' '76d2a88733cebb1f01b766ff2ab91a9e095bae1d2e4cc18c1ffcf21fd095efc4' '715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26' @@ -99,7 +99,8 @@ sha256sums=('e1363888216b455184dbb8a74a347bf5612f56a3f982369e1cba6c7e0726cde1' validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta -noextract=(clang-${_pkgver}.src.tar.xz) +noextract=(clang-${_pkgver}.src.tar.xz + llvm-${_pkgver}.src.tar.xz) apply_patch_with_msg() { for _patch in "$@" @@ -122,6 +123,9 @@ prepare() { plain "Extracting clang-${_pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)" tar -xJf "${srcdir}"/clang-${_pkgver}.src.tar.xz -C "${srcdir}" || true + plain "Extracting llvm-${_pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)" + tar -xJf "${srcdir}"/llvm-${_pkgver}.src.tar.xz -C "${srcdir}" || true + # Rename Directories for pkg in llvm clang clang-tools-extra compiler-rt lld cmake third-party; do mv ${pkg}-${_pkgver}.src ${pkg} diff --git a/mingw-w64-mlir/PKGBUILD b/mingw-w64-mlir/PKGBUILD index e42448f303..c8190ada34 100644 --- a/mingw-w64-mlir/PKGBUILD +++ b/mingw-w64-mlir/PKGBUILD @@ -5,7 +5,7 @@ _compiler=clang _realname=mlir pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 pkgdesc="Multi-Level IR Compiler Framework for LLVM (mingw-w64)" @@ -39,9 +39,9 @@ source=("${_url}/${_pkgfn}.tar.xz"{,.sig} 0002-add-missing-compile-definitions.patch 0003-Fix-build-MLIRExecutionEngineShared.patch 0004-disable-mlir-pdll-lsp-server-with-clang.patch) -sha256sums=('850d218ffefb82de8ba91c56c6fd183d7fa58de565629e1453b6df00617b1e65' +sha256sums=('75086853150ffe559a747559644c5c4b619b93f6fefc2bb2bfc3b143c97ae1ea' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' + '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769' 'SKIP' '3f61c66d5615e387ac1c00dbeb1b5840305ff578de81d60eb65553ff17ced8c6' 'd007b26d4c97667518f524105d5a7a14c9fe9e5f595fd48562dacb722ea650fa' diff --git a/mingw-w64-polly/PKGBUILD b/mingw-w64-polly/PKGBUILD index 7f03b72c72..1dacf019e4 100644 --- a/mingw-w64-polly/PKGBUILD +++ b/mingw-w64-polly/PKGBUILD @@ -7,7 +7,7 @@ fi _realname=polly pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=20.1.8 +_pkgver=21.1.1 pkgver=${_pkgver/-/} pkgrel=1 pkgdesc="Polly - Polyhedral optimizations for LLVM (mingw-w64)" @@ -24,9 +24,9 @@ _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver} _pkgfn=${_realname}-${_pkgver}.src source=($_url/$_pkgfn.tar.xz{,.sig} ${_url}/cmake-${_pkgver}.src.tar.xz{,.sig}) -sha256sums=('ffa8252aa46b9eabdcaa4b1841fc4acaf240358d0858d0cd386d62c88e74534e' +sha256sums=('1b13d47af2d80dece35b0562effe8c6dfd5cd23c80ed091236ad1691ad809987' 'SKIP' - '3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634' + '9c0b9064b7d0f2a3004f1d034aadf84d2af4e5dca2135ebf697b0a1eb85ef769' 'SKIP') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard