From f3d35736b3dd544a66176b80aa9927c277b7e272 Mon Sep 17 00:00:00 2001 From: Alexander Taepper Date: Wed, 18 Dec 2024 14:12:12 +0100 Subject: [PATCH] fix: correctly specify and copy the conanprofile for arm architectures --- Dockerfile_linter_dependencies | 4 +++- conanprofile.docker_arm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile_linter_dependencies b/Dockerfile_linter_dependencies index fc5af634d..abfc6915d 100644 --- a/Dockerfile_linter_dependencies +++ b/Dockerfile_linter_dependencies @@ -1,5 +1,7 @@ FROM ubuntu:22.04 +ARG TARGETPLATFORM + WORKDIR /src RUN apt update \ @@ -13,7 +15,7 @@ RUN apt update \ RUN pip install conan==2.8.1 -COPY conanfile.py conanprofile.docker ./ +COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ mv conanprofile.docker_arm conanprofile; \ else \ diff --git a/conanprofile.docker_arm b/conanprofile.docker_arm index 274b4b070..494bbb5a3 100644 --- a/conanprofile.docker_arm +++ b/conanprofile.docker_arm @@ -4,5 +4,6 @@ arch=armv8 compiler=gcc compiler.libcxx=libstdc++11 compiler.version=13.2 +compiler.cppstd=20 build_type=Release [options] \ No newline at end of file