diff options
| author | Matthias Dressel <code@deadcode.eu> | 2024-04-16 11:53:16 +0200 |
|---|---|---|
| committer | Matthias Dressel <code@deadcode.eu> | 2024-04-16 11:53:16 +0200 |
| commit | 585190177241ef4e77f462decdc6ad5b2cc5e5e6 (patch) | |
| tree | e80dd5669c2870b57cf3a1acc5a45d2147dd23eb | |
| parent | 37d52435d1e839546e725b7b4116334d3b3a5bac (diff) | |
| download | libdav1d-585190177241ef4e77f462decdc6ad5b2cc5e5e6.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | package/crossfiles/aarch64-w64-mingw32.meson | 16 | ||||
| -rw-r--r-- | package/crossfiles/armv7-w64-mingw32.meson | 16 |
3 files changed, 34 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3c7629..e5625d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/package/crossfiles/aarch64-w64-mingw32.meson b/package/crossfiles/aarch64-w64-mingw32.meson new file mode 100644 index 0000000..23927cc --- /dev/null +++ b/package/crossfiles/aarch64-w64-mingw32.meson @@ -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' diff --git a/package/crossfiles/armv7-w64-mingw32.meson b/package/crossfiles/armv7-w64-mingw32.meson new file mode 100644 index 0000000..191aa2e --- /dev/null +++ b/package/crossfiles/armv7-w64-mingw32.meson @@ -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' |