Commit f835df6b authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Revert "vlc-debian-llvm-mingw: Don't bother building cmake"

This reverts commit 7bfcf658.
parent 67a8e978
......@@ -2,7 +2,7 @@ FROM debian:sid-20201012-slim
MAINTAINER VideoLAN roots <roots@videolan.org>
ENV IMAGE_DATE=202011121119
ENV IMAGE_DATE=202011131520
RUN apt-get update -qq && mkdir -p /usr/share/man/man1 && \
apt-get upgrade -y && \
......@@ -10,8 +10,7 @@ RUN apt-get update -qq && mkdir -p /usr/share/man/man1 && \
git wget bzip2 file unzip libtool-bin pkg-config build-essential \
automake yasm gettext autopoint vim git-svn ninja-build libwine-development \
wine-development flex ragel bison zip dos2unix p7zip-full subversion gperf nsis nasm \
python3 python3-setuptools locales meson libltdl-dev ca-certificates curl default-jdk-headless \
cmake && \
python3 python3-setuptools locales meson libltdl-dev ca-certificates curl default-jdk-headless && \
dpkg --add-architecture i386 && \
apt-get update && apt-get -y install --no-install-suggests --no-install-recommends wine32-development && \
apt-get clean -y && \
......@@ -32,6 +31,17 @@ ARG TOOLCHAIN_ARCHS="i686 x86_64 armv7 aarch64"
ARG CORES=4
RUN CMAKE_VERSION=3.17.0 && \
CMAKE_SHA256=b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847 && \
wget -q http://www.cmake.org/files/v3.17/cmake-$CMAKE_VERSION.tar.gz && \
echo $CMAKE_SHA256 cmake-$CMAKE_VERSION.tar.gz | sha256sum -c && \
tar xzf cmake-$CMAKE_VERSION.tar.gz && \
cd cmake-$CMAKE_VERSION && ./configure --prefix=/opt/tools/ --parallel=$CORES --no-qt-gui -- \
-DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF && make -j$CORES && make install && \
rm -rf /build/*
ENV PATH=/opt/tools/bin:$PATH
# Build everything that uses the llvm monorepo. We need to build the mingw runtime before the compiler-rt/libunwind/libcxxabi/libcxx runtimes.
COPY build-llvm.sh strip-llvm.sh install-wrappers.sh build-mingw-w64.sh build-mingw-w64-tools.sh build-compiler-rt.sh build-mingw-w64-libraries.sh build-libcxx.sh ./
COPY wrappers/*.sh wrappers/*.c wrappers/*.h ./wrappers/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment