From 4fba89fee46f309ff305bd67511ab53bf299114f Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 17 Sep 2021 16:52:49 +0200 Subject: [PATCH] docker: Debian bullseye has a functioning cmake --- packaging/docker/Dockerfile.debian-multiarch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 88b8db108..7ed4bb859 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -40,7 +40,7 @@ RUN dpkg --add-architecture ${ARCH} RUN apt-get update && \ apt-get install -y \ crossbuild-essential-${ARCH} \ - pkg-config make \ + pkg-config cmake make \ autoconf automake autogen libtool \ texinfo git curl tar wget diffutils \ flex bison \ @@ -75,13 +75,6 @@ RUN apt-get update && \ ENV echo /usr/local/lib >> /etc/ld.so.conf && \ echo /usr/local/lib64 >> /etc/ld.so.conf -# Install cmake (version from buster has a bug) -RUN cd /tmp && \ - wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.sh && \ - chmod +x cmake-3.15.3-Linux-x86_64.sh && \ - ./cmake-3.15.3-Linux-x86_64.sh --skip-license --prefix=/usr && \ - rm -rf /tmp/* - ADD cmake/toolchains/debian-${ARCH}.cmake / ENV PKG_CONFIG_PATH=/usr/lib/${TRIPLET}/pkgconfig:/usr/local/lib/${TRIPLET}/pkgconfig