Skip to content

Commit 5688775

Browse files
committed
Fix Windows build by adding llvm-tools dependency.
Shiboken2 and Shiboken6 rely on llvm-config to find the location of clang and its include directory. Recently the clang package had llvm-config split out into a llvm-tools package. This change adds llvm-tools to Natron's build deps packages so that llvm-config will get installed when those packages are installed.
1 parent c3d8358 commit 5688775

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ depends=(
1515
"${MINGW_PACKAGE_PREFIX}-qt5-base"
1616
"${MINGW_PACKAGE_PREFIX}-pyside2"
1717
"${MINGW_PACKAGE_PREFIX}-shiboken2"
18-
# Clang is needed by shiboken2 for now because shiboken2 can't seem to find g++. It appears
18+
# Clang and llvm-tools are needed by shiboken2 for now because shiboken2 can't seem to find g++. It appears
1919
# shiboken2 includes hard-coded paths to the g++ binary that is used when shiboken2 is built for msys2.
2020
# Remove this dependency when the shiboken2 package is fixed so it works w/o clang or updates its pkg deps.
2121
# The following change to msys2 made adding this clang dependency necessary.
2222
# https://github.com/msys2/MINGW-packages/commit/c21027404c9d8776ad7dad94973a209bdc3aede2
23+
# The following change to msys2 made adding the llvm-tools dependency necessary
24+
# https://github.com/msys2/MINGW-packages/commit/bcd8653c7acb7a5273542d535802d957d8b840f2
2325
"${MINGW_PACKAGE_PREFIX}-clang"
26+
"${MINGW_PACKAGE_PREFIX}-llvm-tools"
2427
"${MINGW_PACKAGE_PREFIX}-python-qtpy"
2528
"${MINGW_PACKAGE_PREFIX}-natron-build-deps-common"
2629
)

tools/MINGW-packages/mingw-w64-natron-build-deps-qt6/PKGBUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ depends=(
1616
"${MINGW_PACKAGE_PREFIX}-qt6-5compat"
1717
"${MINGW_PACKAGE_PREFIX}-pyside6"
1818
"${MINGW_PACKAGE_PREFIX}-shiboken6"
19-
# Clang is needed by shiboken6 for now because shiboken6 can't seem to find g++. It appears
19+
# Clang and llvm-tools are needed by shiboken6 for now because shiboken6 can't seem to find g++. It appears
2020
# shiboken6 includes hard-coded paths to the g++ binary that is used when shiboken2 is built for msys2.
2121
# Remove this dependency when the shiboken6 package is fixed so it works w/o clang or updates its pkg deps.
2222
# The following change to msys2 made adding this clang dependency necessary.
2323
# https://github.com/msys2/MINGW-packages/commit/c21027404c9d8776ad7dad94973a209bdc3aede2
24+
# The following change to msys2 made adding the llvm-tools dependency necessary
25+
# https://github.com/msys2/MINGW-packages/commit/bcd8653c7acb7a5273542d535802d957d8b840f2
2426
"${MINGW_PACKAGE_PREFIX}-clang"
27+
"${MINGW_PACKAGE_PREFIX}-llvm-tools"
2528
"${MINGW_PACKAGE_PREFIX}-python-qtpy"
2629
"${MINGW_PACKAGE_PREFIX}-natron-build-deps-common"
2730
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20250523-1
1+
20250524-1

0 commit comments

Comments
 (0)