From f3555361e62ba48bf9b408e18c4d44821365604e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 23 Feb 2025 13:21:24 +0100 Subject: [PATCH] cross: Add ninja-build to the docker images Useful for future Skia builds that don't bring their own copy of ninja anymore. --- docker/Dockerfile.aarch64-unknown-linux-gnu | 2 +- docker/Dockerfile.armv7-unknown-linux-gnueabihf | 2 +- docker/Dockerfile.riscv64gc-unknown-linux-gnu | 2 +- docker/Dockerfile.x86_64-unknown-linux-gnu | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index 4ad54f08501..0fa26964dfc 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN dpkg --add-architecture arm64 && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes libfontconfig1-dev:arm64 libxcb1-dev:arm64 libxcb-render0-dev:arm64 libxcb-shape0-dev:arm64 libxcb-xfixes0-dev:arm64 libxkbcommon-dev:arm64 libinput-dev:arm64 libgbm-dev:arm64 libssl-dev:arm64 python3 python3-pip \ libfontconfig1-dev \ - clang libstdc++-10-dev:arm64 + clang libstdc++-10-dev:arm64 ninja-build # Work around the Skia source build requiring a newer git version (that supports --path-format=relative with rev-parse, as needed by git-sync-deps.py), # as well as a disabling of the directory safety checks (https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765) as diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf index fc814d8c8b5..9fff9730976 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -9,7 +9,7 @@ RUN dpkg --add-architecture armhf && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes libfontconfig1-dev:armhf libxcb1-dev:armhf libxcb-render0-dev:armhf libxcb-shape0-dev:armhf libxcb-xfixes0-dev:armhf libxkbcommon-dev:armhf libinput-dev:armhf libgbm-dev:armhf libssl-dev:armhf python3 python3-pip \ libfontconfig1-dev \ - clang libstdc++-10-dev:armhf + clang libstdc++-10-dev:armhf ninja-build # Work around the Skia source build requiring a newer git version (that supports --path-format=relative with rev-parse, as needed by git-sync-deps.py), # as well as a disabling of the directory safety checks (https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765) as diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu index 5e9bc8b56ff..2ae59153a7d 100644 --- a/docker/Dockerfile.riscv64gc-unknown-linux-gnu +++ b/docker/Dockerfile.riscv64gc-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN dpkg --add-architecture riscv64 && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes libfontconfig1-dev:riscv64 libxcb1-dev:riscv64 libxcb-render0-dev:riscv64 libxcb-shape0-dev:riscv64 libxcb-xfixes0-dev:riscv64 libxkbcommon-dev:riscv64 libinput-dev:riscv64 libgbm-dev:riscv64 python3 python3-pip \ libfontconfig1-dev \ - clang libstdc++-10-dev:riscv64 + clang libstdc++-10-dev:riscv64 ninja-build # Work around the Skia source build requiring a newer git version (that supports --path-format=relative with rev-parse, as needed by git-sync-deps.py), # as well as a disabling of the directory safety checks (https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765) as diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu index 6804b6b71b9..984ff69efb3 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-gnu +++ b/docker/Dockerfile.x86_64-unknown-linux-gnu @@ -8,7 +8,7 @@ FROM ghcr.io/slint-ui/cross-x86_64-base:1.0 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes libfontconfig1-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libinput-dev libgbm-dev python3 \ python3-pip libfontconfig1-dev \ - clang libstdc++-10-dev + clang libstdc++-10-dev ninja-build # Work around the Skia source build requiring a newer git version (that supports --path-format=relative with rev-parse, as needed by git-sync-deps.py), # as well as a disabling of the directory safety checks (https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765) as