From 1f4153c29a8a3a0a8feb4b6eaad33349c8d2dc55 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 4 Apr 2025 10:03:29 -0400 Subject: [PATCH 1/3] fix cargo-c dep issue --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b5826a..af2d4d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,7 +131,7 @@ RUN \ tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \ cd /tmp/rust && \ ./install.sh && \ - cargo install cargo-c cbindgen && \ + cargo install cargo-c cbindgen --locked && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index fcbf58e..73109c1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -95,7 +95,7 @@ RUN \ tar xf /tmp/rust.tar.gz -C /tmp/rust --strip-components=1 && \ cd /tmp/rust && \ ./install.sh && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ From 2b5a969177c6333519d09d9c4bd7473cd47bd8db Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:24:00 -0400 Subject: [PATCH 2/3] fix cmake 4.0.0 failing with no minimum defined --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index af2d4d8..5397032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ ARG FFMPEG_VERSION ENV \ DEBIAN_FRONTEND="noninteractive" \ MAKEFLAGS="-j4" \ + CMAKE_POLICY_VERSION_MINIMUM="3.5" \ PATH="/root/.cargo/bin:${PATH}" # versions diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 73109c1..228e5ba 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,6 +10,7 @@ ARG FFMPEG_VERSION ENV \ DEBIAN_FRONTEND="noninteractive" \ MAKEFLAGS="-j4" \ + CMAKE_POLICY_VERSION_MINIMUM="3.5" \ PATH="/root/.cargo/bin:${PATH}" # versions From 8b98868c40f461df01ff8f58b5f9d23a40e64539 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:01:25 -0400 Subject: [PATCH 3/3] pin cmake as 4.0.0 breaks a lot of things --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5397032..7200d4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,7 @@ RUN \ pip \ setuptools \ wheel && \ - pip install --no-cache-dir cmake mako meson ninja packaging ply pyyaml + pip install --no-cache-dir cmake==3.31.6 mako meson ninja packaging ply pyyaml # compile 3rd party libs RUN \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 228e5ba..20fc1c0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -102,7 +102,7 @@ RUN \ pip \ setuptools \ wheel && \ - pip install --no-cache-dir cmake meson ninja + pip install --no-cache-dir cmake==3.31.6 meson ninja # compile 3rd party libs RUN \