mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
docker: Debian bullseye has a functioning cmake
This commit is contained in:
parent
9ffb6095ff
commit
4fba89fee4
1 changed files with 1 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue