CI: Move llvm crossfiles from image to project

Since dav1d was the only user of these crossfiles, it was agreed upon to
remove them from the image [0] and move to dav1d directly. [1]

[0] https://code.videolan.org/videolan/docker-images/-/merge_requests/293
[1] https://code.videolan.org/videolan/docker-images/-/merge_requests/294#note_434720
This commit is contained in:
Matthias Dressel 2024-04-16 11:53:16 +02:00
parent 37d52435d1
commit 5851901772
3 changed files with 34 additions and 2 deletions

View File

@ -18,7 +18,7 @@ stages:
- amd64
.debian-llvm-mingw-common:
image: registry.videolan.org/vlc-debian-llvm-msvcrt:20240406142551
image: registry.videolan.org/vlc-debian-llvm-msvcrt:20240415145055
stage: build
tags:
- docker
@ -276,7 +276,7 @@ build-win-arm:
--werror
--libdir lib
--prefix "$(pwd)/build/dav1d_install"
--cross-file /opt/crossfiles/${CROSSFILE}.meson
--cross-file package/crossfiles/${CROSSFILE}.meson
-Ddefault_library=both
-Dtrim_dsp=false
- ninja -C build

View File

@ -0,0 +1,16 @@
[binaries]
c = 'aarch64-w64-mingw32-clang'
cpp = 'aarch64-w64-mingw32-clang++'
ar = 'aarch64-w64-mingw32-ar'
strip = 'aarch64-w64-mingw32-strip'
pkgconfig = 'pkg-config'
windres = 'aarch64-w64-mingw32-windres'
[properties]
c_link_args = ['-static-libgcc']
[host_machine]
system = 'windows'
cpu_family = 'aarch64'
cpu = 'aarch64'
endian = 'little'

View File

@ -0,0 +1,16 @@
[binaries]
c = 'armv7-w64-mingw32-clang'
cpp = 'armv7-w64-mingw32-clang++'
ar = 'armv7-w64-mingw32-ar'
strip = 'armv7-w64-mingw32-strip'
pkgconfig = 'pkg-config'
windres = 'armv7-w64-mingw32-windres'
[properties]
c_link_args = ['-static-libgcc']
[host_machine]
system = 'windows'
cpu_family = 'arm'
cpu = 'armv7'
endian = 'little'