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

Update cmake and ninja version

Browse Source 
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2022-05-18 17:45:56 +02:00
parent e3084efc93
commit c74798ebb7
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/common.docker
View File

@ -1,7 +1,8 @@
WORKDIR /usr/src WORKDIR /usr/src
ARG GIT_VERSION=2.32.0 ARG GIT_VERSION=2.36.1
ARG CMAKE_VERSION=3.21.1 ARG CMAKE_VERSION=3.23.1
ARG NINJA_VERSION=1.11.0
ARG FLATCC_VERSION=d90ed18ad09824297ffd5fbc578ccb1666d13890 ARG FLATCC_VERSION=d90ed18ad09824297ffd5fbc578ccb1666d13890
# Image build scripts # Image build scripts
@ -25,7 +26,7 @@ RUN \
/buildscripts/build-and-install-openssh.sh && \ /buildscripts/build-and-install-openssh.sh && \
/buildscripts/build-and-install-curl.sh && \ /buildscripts/build-and-install-curl.sh && \
/buildscripts/build-and-install-git.sh && \ /buildscripts/build-and-install-git.sh && \
if [ "$CMAKE_BIN" = "true" ]; then CMAKE_VERSION=3.17.1 && /buildscripts/install-cmake-binary.sh $X86_FLAG;else /buildscripts/build-and-install-cmake.sh $X86_FLAG;fi && \ /buildscripts/build-and-install-cmake.sh $X86_FLAG && \
/buildscripts/install-liquidprompt-binary.sh && \ /buildscripts/install-liquidprompt-binary.sh && \
PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
/buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \

10
imagefiles/build-and-install-ninja.sh
View File

@ -25,14 +25,20 @@ while [ $# -gt 0 ]; do
shift shift
done done
if [[ -z "${NINJA_VERSION}" ]]; then
echo >&2 'error: NINJA_VERSION env. variable must be set to a non-empty value'
exit 1
fi
# Download # Download
REV=v1.10.2 url="https://github.com/ninja-build/ninja/archive/${NINJA_VERSION}.tar.gz"
curl --connect-timeout 30 \ curl --connect-timeout 30 \
--max-time 10 \ --max-time 10 \
--retry 5 \ --retry 5 \
--retry-delay 10 \ --retry-delay 10 \
--retry-max-time 30 \ --retry-max-time 30 \
-# -o ninja.tar.gz -LO https://github.com/ninja-build/ninja/archive/$REV.tar.gz -# -o ninja.tar.gz -LO "v$url"
mkdir ninja mkdir ninja
tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja