build/windows: Move 'toolchain' to unified deps list
'toolchain' package is out of the list since the earlier days of the
unified deps list (5f164ef9) to not break commands of crossroads
(https://gitlab.freedesktop.org/crossroad/crossroad/-/issues/3)
and quasi-msys2 (https://github.com/HolyBlackCat/quasi-msys2/issues/30)
Both do not support package groups, but there is a better workaround.
This commit is contained in:
parent
744c022791
commit
44c0fc2bfd
3 changed files with 3 additions and 2 deletions
|
|
@ -46,7 +46,7 @@ if ("$PSCommandPath" -like "*1_build-deps-msys2.ps1*" -or "$CI_JOB_NAME" -like "
|
|||
{
|
||||
pacman --noconfirm -Suy
|
||||
}
|
||||
pacman --noconfirm -S --needed $MINGW_PACKAGE_PREFIX-toolchain (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','')
|
||||
pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt).Replace('${MINGW_PACKAGE_PREFIX}',$MINGW_PACKAGE_PREFIX).Replace(' \','')
|
||||
Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ cd ..
|
|||
## Install the required (pre-built) packages for babl, GEGL and GIMP
|
||||
echo -e "\e[0Ksection_start:`date +%s`:deps_install[collapsed=true]\r\e[0KInstalling dependencies provided by MSYS2"
|
||||
echo ${MSYSTEM_PREFIX^^} > quasi-msys2/msystem.txt
|
||||
deps=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt |
|
||||
deps=$(cat ${GIMP_DIR}build/windows/all-deps-uni.txt | sed 's/toolchain/clang/g' |
|
||||
sed "s/\${MINGW_PACKAGE_PREFIX}-/_/g" | sed 's/\\//g')
|
||||
cd quasi-msys2
|
||||
make install _clang $deps || $true
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ ${MINGW_PACKAGE_PREFIX}-gobject-introspection \
|
|||
${MINGW_PACKAGE_PREFIX}-headers-git \
|
||||
${MINGW_PACKAGE_PREFIX}-libxslt \
|
||||
${MINGW_PACKAGE_PREFIX}-meson \
|
||||
${MINGW_PACKAGE_PREFIX}-toolchain
|
||||
${MINGW_PACKAGE_PREFIX}-vala \
|
||||
|
||||
${MINGW_PACKAGE_PREFIX}-aalib \
|
||||
|
|
|
|||
Loading…
Reference in a new issue