Skip to content

Commit f3041a2

Browse files
committed
rebuild packages against llvm-20
1 parent 2444310 commit f3041a2

File tree

13 files changed

+93
-37
lines changed

13 files changed

+93
-37
lines changed
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/cpp/CMakeLists.txt
2+
+++ b/cpp/CMakeLists.txt
3+
@@ -160,6 +160,7 @@
4+
set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
5+
6+
set(ARROW_LLVM_VERSIONS
7+
+ "20.1"
8+
"19.1"
9+
"18.1"
10+
"17.0"

mingw-w64-arrow/PKGBUILD

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=arrow
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=19.0.1
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
99
arch=(any)
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -48,9 +48,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
4848
"${MINGW_PACKAGE_PREFIX}-python"
4949
"${MINGW_PACKAGE_PREFIX}-xsimd")
5050
source=("https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"
51-
"https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc")
51+
"https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc"
52+
"001-accept-llvm-20.1.patch")
5253
sha256sums=('acb76266e8b0c2fbb7eb15d542fbb462a73b3fd1e32b80fad6c2fafd95a51160'
53-
'SKIP')
54+
'SKIP'
55+
'932274355d34b6406dbad9e911ac5adf59dfdfcd05d001bf81e7925822fc8165')
5456
# See generate-valid-keys.sh
5557
validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B'
5658
'87C072B8B6405B5780D66A3D02DABFDF1679D194'
@@ -69,6 +71,11 @@ validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B'
6971
'B90EB64A3AF15545EC8A7B8803F0D5EA3790810C'
7072
'AF6AADA4C9835B75973FF5DA275C532289DD0F4A')
7173

74+
prepare() {
75+
cd apache-${_realname}-${pkgver}
76+
patch -p1 -i "${srcdir}"/001-accept-llvm-20.1.patch
77+
}
78+
7279
build() {
7380
if check_option "debug" "n"; then
7481
export _cmake_build_type="Release"

mingw-w64-castxml/PKGBUILD

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ _realname=castxml
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=0.6.11
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="C-family abstract syntax tree XML output tool. (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url='https://github.com/CastXML/CastXML'
1212
license=('spdx:Apache-2.0')
13-
depends=("${MINGW_PACKAGE_PREFIX}-clang-libs")
13+
depends=("${MINGW_PACKAGE_PREFIX}-clang-libs"
14+
"${MINGW_PACKAGE_PREFIX}-llvm-libs")
1415
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
1516
"${MINGW_PACKAGE_PREFIX}-cmake"
1617
"${MINGW_PACKAGE_PREFIX}-ninja"

mingw-w64-crystal/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
crystal
2+
001-support-llvm-20.patch
3+
002-fix-llvm-version-detection.patch

mingw-w64-crystal/PKGBUILD

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Maintainer: Quinton Miller <[email protected]>
22

3-
_bootstrap=0
3+
_bootstrap=1
44
_realname=crystal
55
pkgbase="mingw-w64-${_realname}"
66
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
77
pkgver=1.15.1
8-
pkgrel=2
8+
pkgrel=3
99
pkgdesc="Fast and statically typed, compiled language with Ruby-like syntax (mingw-w64)"
1010
arch=('any')
1111
mingw_arch=('ucrt64' 'mingw64' 'clang64')
@@ -31,15 +31,19 @@ depends=(
3131
"${MINGW_PACKAGE_PREFIX}-zlib"
3232
)
3333
makedepends=(
34-
"git"
3534
"${MINGW_PACKAGE_PREFIX}-llvm"
3635
$( (( _bootstrap )) || echo "${MINGW_PACKAGE_PREFIX}-crystal")
36+
"git"
3737
)
3838
checkdepends=(
3939
"${MINGW_PACKAGE_PREFIX}-lld" # needed for linking std_spec
4040
)
41-
source=("$pkgname-$pkgver::git+${msys2_repository_url}.git#tag=${pkgver}")
42-
sha256sums=('626fed60399d7f1dc83e2e5a2ecde20d235e19a3dcf6d70d6f52ec4de063b32b')
41+
source=("${_realname}::git+${msys2_repository_url}.git#tag=${pkgver}"
42+
"001-support-llvm-20.patch::https://github.com/crystal-lang/crystal/commit/1c03dfa3.patch"
43+
"002-fix-llvm-version-detection.patch::https://github.com/crystal-lang/crystal/commit/1fafbb2b.patch")
44+
sha256sums=('626fed60399d7f1dc83e2e5a2ecde20d235e19a3dcf6d70d6f52ec4de063b32b'
45+
'23957732539eb4dc1b2cce03ebdaa169804fade3c0ba81a53ad430556989e340'
46+
'f02c6393f6a4bf8fd92b0fb42131b0e45c61b30d86441458b370d7c7ebe6a816')
4347

4448
if (( _bootstrap ))
4549
then
@@ -49,31 +53,33 @@ then
4953
fi
5054

5155
prepare() {
52-
cd "$pkgname-$pkgver"
53-
if test true != "$(git config core.symlinks)"
54-
then
56+
cd "${_realname}"
57+
58+
if test true != "$(git config core.symlinks)"; then
5559
git config core.symlinks true &&
5660
MSYS='winsymlinks:nativestrict' git restore --source=HEAD :/
5761
fi
62+
63+
patch -p1 -i "${srcdir}"/001-support-llvm-20.patch
64+
patch -p1 -i "${srcdir}"/002-fix-llvm-version-detection.patch
5865
}
5966

6067
build() {
61-
cd "$pkgname-$pkgver"
62-
if (( _bootstrap ))
63-
then
68+
cd "${_realname}"
69+
if (( _bootstrap )); then
6470
CRYSTAL="$srcdir/bin/crystal.exe" make interpreter=1 release=1
6571
else
6672
make interpreter=1 release=1
6773
fi
6874
}
6975

7076
check() {
71-
cd "$pkgname-$pkgver"
77+
cd "${_realname}"
7278
# the full suite is run on the crystal-lang/crystal repo's own CI
7379
CRYSTAL_SPEC_COMPILER_BIN="$(pwd)/.build/crystal.exe" make std_spec
7480
}
7581

7682
package() {
77-
cd "$pkgname-$pkgver"
83+
cd "${_realname}"
7884
make install DESTDIR="$pkgdir" PREFIX="${MINGW_PREFIX}" deref_symlinks=1
7985
}

mingw-w64-cvise/PKGBUILD

+11-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=cvise
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=2.11.0
7-
pkgrel=3
7+
pkgrel=4
88
pkgdesc="Super-parallel Python port of the C-Reduce (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -17,6 +17,7 @@ depends=(
1717
"${MINGW_PACKAGE_PREFIX}-gcc-libs"
1818
"${MINGW_PACKAGE_PREFIX}-clang-libs"
1919
"${MINGW_PACKAGE_PREFIX}-clang"
20+
"${MINGW_PACKAGE_PREFIX}-llvm-libs"
2021
"${MINGW_PACKAGE_PREFIX}-python"
2122
"${MINGW_PACKAGE_PREFIX}-python-chardet"
2223
"${MINGW_PACKAGE_PREFIX}-python-pebble"
@@ -31,8 +32,15 @@ makedepends=(
3132
)
3233
checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
3334
optdepends=("colordiff")
34-
source=("https://github.com/marxin/cvise/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
35-
sha256sums=('7e3e473843aa79afb98f581d2e100efa47db80df3a961565b691d7b4a4ebd14b')
35+
source=("https://github.com/marxin/cvise/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
36+
"001-fix-build-with-llvm-20.patch::https://github.com/marxin/cvise/commit/29fc072f.patch")
37+
sha256sums=('7e3e473843aa79afb98f581d2e100efa47db80df3a961565b691d7b4a4ebd14b'
38+
'99271cc615968178fc6edefb3cd50656bf513b2e7a6294f104fa5536d0b8a6ae')
39+
40+
prepare() {
41+
cd ${_realname}-${pkgver}
42+
patch -p1 -i "${srcdir}"/001-fix-build-with-llvm-20.patch
43+
}
3644

3745
build() {
3846
declare -a _extra_config

mingw-w64-ghdl/.gitignore

-1
This file was deleted.
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/configure
2+
+++ b/configure
3+
@@ -324,6 +324,7 @@
4+
check_version 17.0 $llvm_version ||
5+
check_version 18.1 $llvm_version ||
6+
check_version 19. $llvm_version ||
7+
+ check_version 20. $llvm_version ||
8+
false; then
9+
echo "Debugging is enabled with llvm $llvm_version"
10+
else

mingw-w64-ghdl/PKGBUILD

+10-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgname=(
55
"${MINGW_PACKAGE_PREFIX}-${_realname}-mcode"
66
)
77
pkgver=5.0.1
8-
pkgrel=1
8+
pkgrel=2
99
pkgdesc='GHDL: the open-source analyzer, compiler, simulator and (experimental) synthesizer for VHDL'
1010
arch=('any')
1111
mingw_arch=('mingw64' 'ucrt64')
@@ -23,12 +23,15 @@ makedepends=(
2323
)
2424
checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
2525
options=(!emptydirs)
26-
source=(
27-
"https://github.com/ghdl/ghdl/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
28-
)
29-
sha256sums=(
30-
'a4cef27312a158c28498eeb62a470007354755b267adb62005a04b66143a1f92'
31-
)
26+
source=("https://github.com/ghdl/ghdl/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
27+
001-support-llvm-20.patch)
28+
sha256sums=('a4cef27312a158c28498eeb62a470007354755b267adb62005a04b66143a1f92'
29+
'985963845c63b12907891580b08c4273c4178a111f35c950f77e10c9fa63da23')
30+
31+
prepare() {
32+
cd ${_realname}-${pkgver}
33+
patch -p1 -i "${srcdir}"/001-support-llvm-20.patch
34+
}
3235

3336
build() {
3437
echo "Building ghdl-llvm..."

mingw-w64-include-what-you-use/PKGBUILD

+13-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=include-what-you-use
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=0.23
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="A tool for use with clang to analyze #includes in C and C++ source files (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -14,14 +14,23 @@ msys2_references=(
1414
'aur: include-what-you-use'
1515
)
1616
license=('spdx:NCSA')
17-
depends=("${MINGW_PACKAGE_PREFIX}-clang-libs"
17+
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
18+
"${MINGW_PACKAGE_PREFIX}-clang-libs"
19+
"${MINGW_PACKAGE_PREFIX}-llvm-libs"
1820
"${MINGW_PACKAGE_PREFIX}-python")
1921
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
2022
"${MINGW_PACKAGE_PREFIX}-cmake"
2123
"${MINGW_PACKAGE_PREFIX}-ninja"
2224
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra")
23-
source=("https://github.com/${_realname}/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
24-
sha256sums=('16672743fdf781d7db313f48c7f4b34bc6517eddfd92d7db793790fe793a306c')
25+
source=("https://github.com/${_realname}/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
26+
"001-fix-build-with-llvm-20.patch::https://github.com/include-what-you-use/include-what-you-use/commit/e2e42c6b.patch")
27+
sha256sums=('16672743fdf781d7db313f48c7f4b34bc6517eddfd92d7db793790fe793a306c'
28+
'ed0cdfa8c6e16c0c20346ffcf7c1fb31b58c85f1bf1308976b5c0132a1a17c4b')
29+
30+
prepare() {
31+
cd ${_realname}-${pkgver}
32+
patch -p1 -i "${srcdir}"/001-fix-build-with-llvm-20.patch
33+
}
2534

2635
build() {
2736
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

mingw-w64-mesa/PKGBUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=mesa
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=25.0.0
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="Open-source implementation of the OpenGL, Vulkan and OpenCL specifications (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -109,7 +109,7 @@ build() {
109109
-Dmicrosoft-clc=enabled
110110
-Dspirv-to-dxil=true
111111
-Dstatic-libclc=all
112-
-Dvulkan-drivers=microsoft-experimental,swrast
112+
-Dvulkan-drivers=microsoft-experimental,swrast,gfxstream
113113
)
114114

115115
MSYS2_ARG_CONV_EXCL="--prefix=" \

mingw-w64-qt-creator/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
88
"${MINGW_PACKAGE_PREFIX}-${_realname}-devel")
99
_base_ver=15.0.0
1010
pkgver=${_base_ver/-/}
11-
pkgrel=2
11+
pkgrel=3
1212
pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)'
1313
arch=('any')
1414
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-qt6-tools/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
66
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
77
_qtver=6.8.2
88
pkgver=${_qtver/-/}
9-
pkgrel=1
9+
pkgrel=2
1010
pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp) (mingw-w64)'
1111
arch=(any)
1212
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

0 commit comments

Comments
 (0)