Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

base: update CMake and ninja to latest versions

Browse Source
This commit is contained in:
Matt McCormick 2016-07-04 01:31:25 -04:00
parent 3a96030b23
commit caa56f50a4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -40,7 +40,7 @@ COPY imagefiles/.bashrc /root/
WORKDIR /usr/src WORKDIR /usr/src
RUN git clone git://cmake.org/cmake.git CMake && \ RUN git clone git://cmake.org/cmake.git CMake && \
cd CMake && \ cd CMake && \
git checkout v3.4.3 && \ git checkout v3.6.0-rc4 && \
cd .. && mkdir CMake-build && cd CMake-build && \ cd .. && mkdir CMake-build && cd CMake-build && \
/usr/src/CMake/bootstrap \ /usr/src/CMake/bootstrap \
--parallel=$(nproc) \ --parallel=$(nproc) \
@ -56,7 +56,7 @@ RUN git clone git://cmake.org/cmake.git CMake && \
# Build and install Ninja from source # Build and install Ninja from source
RUN git clone https://github.com/martine/ninja.git && \ RUN git clone https://github.com/martine/ninja.git && \
cd ninja && \ cd ninja && \
git checkout v1.6.0 && \ git checkout v1.7.1 && \
python ./configure.py --bootstrap && \ python ./configure.py --bootstrap && \
./ninja && \ ./ninja && \
cp ./ninja /usr/bin/ && \ cp ./ninja /usr/bin/ && \