Skip to content

Commit d5fb378

Browse files
authored
Merge pull request #135 from git-for-windows/mingw-w64-llvm-19.1.6
mingw-w64-llvm: update to 19.1.6
2 parents 56d5c67 + 9b5b0a9 commit d5fb378

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

mingw-w64-llvm/0002-Fix-Findzstd-on-MINGW.patch

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/cmake/modules/Findzstd.cmake
2-
+++ b/cmake/modules/Findzstd.cmake
1+
--- llvm/cmake/modules/Findzstd.cmake.orig 2024-09-17 13:26:36.000000000 +0200
2+
+++ llvm/cmake/modules/Findzstd.cmake 2024-09-29 13:19:16.980962300 +0200
33
@@ -16,6 +16,8 @@
44
set(zstd_STATIC_LIBRARY_SUFFIX "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
55
endif()
@@ -9,9 +9,9 @@
99
find_path(zstd_INCLUDE_DIR NAMES zstd.h)
1010
find_library(zstd_LIBRARY NAMES zstd zstd_static)
1111
find_library(zstd_STATIC_LIBRARY NAMES
12-
@@ -27,16 +29,17 @@
13-
zstd DEFAULT_MSG
14-
zstd_LIBRARY zstd_INCLUDE_DIR
12+
@@ -27,17 +29,18 @@
13+
zstd DEFAULT_MSG
14+
zstd_LIBRARY zstd_INCLUDE_DIR
1515
)
1616
+endif()
1717

@@ -25,8 +25,9 @@
2525
+ if(WIN32)
2626
# IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
2727
get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
28-
- string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
29-
+ string(REGEX REPLACE "\\${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
28+
if(NOT "${CMAKE_INSTALL_LIBDIR}" STREQUAL "" AND NOT "${CMAKE_INSTALL_BINDIR}" STREQUAL "")
29+
- string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
30+
+ string(REGEX REPLACE "\\${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
31+
endif()
3032
get_filename_component(zstd_BASENAME "${zstd_LIBRARY}" NAME)
3133
string(REGEX REPLACE "\\${CMAKE_LINK_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}" zstd_BASENAME "${zstd_BASENAME}")
32-
set_target_properties(zstd::libzstd_shared PROPERTIES

mingw-w64-llvm/0003-add-pthread-as-system-lib-for-mingw.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ index 0a8e3897cce..de9cda5dda3 100644
1414
@@ -41,6 +41,9 @@ set(system_libs)
1515
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
1616
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
17-
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 ws2_32)
17+
# ntdll required for RtlGetLastNtStatus in lib/Support/ErrorHandling.cpp.
18+
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 ws2_32 ntdll)
1819
+ if( MINGW )
1920
+ set(system_libs ${system_libs} pthread)
2021
+ endif()

mingw-w64-llvm/0004-enable-emutls-for-mingw.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
+ isOSCygMing() || isOHOSFamily();
99
}
1010

11-
/// Tests whether the target uses -data-sections as default.
11+
/// True if the target supports both general-dynamic and TLSDESC, and TLSDESC

mingw-w64-llvm/PKGBUILD

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-llvm"
2828
"${MINGW_PACKAGE_PREFIX}-compiler-rt"
2929
$( (( _clangprefix )) && echo "${MINGW_PACKAGE_PREFIX}-gcc-compat" )
3030
"${MINGW_PACKAGE_PREFIX}-lld")
31-
_version=18.1.6
31+
_version=19.1.6
3232
_rc=""
3333
_tag=llvmorg-${_version}${_rc}
3434
pkgver=${_version}${_rc/-/}
3535
pkgrel=2
3636
pkgdesc="C language family frontend for LLVM (mingw-w64)"
3737
arch=('any')
38-
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
38+
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
3939
url="https://llvm.org/"
4040
msys2_references=(
4141
"cpe: cpe:/a:llvm:llvm"
@@ -52,7 +52,6 @@ makedepends=($([[ "$_compiler" == "clang" ]] && echo \
5252
"${MINGW_PACKAGE_PREFIX}-libffi"
5353
"${MINGW_PACKAGE_PREFIX}-z3"
5454
"${MINGW_PACKAGE_PREFIX}-python"
55-
"${MINGW_PACKAGE_PREFIX}-python-sphinx"
5655
$((( _clangprefix )) && echo \
5756
"${MINGW_PACKAGE_PREFIX}-compiler-rt" \
5857
"${MINGW_PACKAGE_PREFIX}-libc++")
@@ -79,24 +78,24 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
7978
"0303-ignore-new-bfd-options.patch"
8079
# 0401-0499 -> clang-tools-extra
8180
)
82-
sha256sums=('c231d0a5445db2aafab855e052c247bdd9856ff9d7d9bffdd04e9f0bf8d5366f'
81+
sha256sums=('ad1a3b125ff014ded290094088de40efb9193ce81a24278184230b7d401f8a3e'
8382
'SKIP'
84-
'54e0817f918b90b5f94684e9729ac2f9d3820fce040d6395d71c1f19ffa3b03c'
83+
'6358cbb3e14687ca2f3465c61cffc65589b448aaa912ec2c163ef9fc046e8a89'
8584
'SKIP'
86-
'd78732ec6d55b7374abe14b97c9529a7b56a1fe19929a5bf4c3802b69f77764e'
85+
'417a7d0048d8eb62dbaa8461f1fd474eb6493b09e14d050b39cc1f051e8b71d1'
8786
'SKIP'
88-
'f05f4e15a4524194c93303aa6027006a5182eccfe8f5c90491c2f1fbfcedb96b'
87+
'0d4f312e1419152282c267e6b6a1fa5914a7a0c753a5e926bee1c8c28e614ae4'
8988
'SKIP'
90-
'f1f059c2bf98ffa558cd0c48ea568736c41f0c8029dabb53147d48b9efdaa802'
89+
'44fa50556cefbe3796e8256536267ee2f34ced5f3c1492473bccd75449cadbe6'
9190
'SKIP'
92-
'a643261ed98ff76ab10f1a7039291fa841c292435ba1cfe11e235c2231b95cdb'
91+
'9c7ec82d9a240dc2287b8de89d6881bb64ceea0dcd6ce133c34ef65bda22d99e'
9392
'SKIP'
94-
'4ae7b394d341aea6fb7d3d373a4f561ba8e48c0fecded4bb4f1f5f12ba9bd2b6'
93+
'0e8048333bab2ba3607910e5d074259f08dccf00615778d03a2a55416718eb45'
9594
'SKIP'
9695
'eb03df53671df6627768141b3aaa76abe176a14e5e47911c97bec544387c4aff'
97-
'0aff3a85d70ae437dfc634fe40db506bf5701403049284ffbdb931135ae8a483'
98-
'016fbf6f742c062cc59360070264546c10385b1e8c37605758f62dcbea8f9bcc'
99-
'5f86e542dd1ec92b2fe06ee59061c3e23512df7bafabe82206f2b7d80b81836b'
96+
'ff8bf96fae9531cf6231b502e8c2f38843f826a9dc7e0d98a37cb80fddd36cf4'
97+
'790eb0fccb4ef29c3795bceb8a62c8f4ecd0bdd6c49b2812352b04cfbc552342'
98+
'76d2a88733cebb1f01b766ff2ab91a9e095bae1d2e4cc18c1ffcf21fd095efc4'
10099
'715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26'
101100
'2770cadf8ccf6b31aece6aee8f76dceb71e6e9d01fdf3be74c3743480ce34899'
102101
'fd0253879cc5e31857f57307e6105e56493358e35d7c4540e0b476be607ab94e')
@@ -289,7 +288,6 @@ build() {
289288
${MINGW_PREFIX}/bin/cmake.exe \
290289
-GNinja \
291290
-DLLVM_ENABLE_PROJECTS="${_projects}" \
292-
-DLLVM_ENABLE_SPHINX=OFF \
293291
-DLLVM_ENABLE_RTTI=ON \
294292
-DLLVM_INSTALL_UTILS=ON \
295293
-DLIBCLANG_BUILD_STATIC=ON \

0 commit comments

Comments
 (0)