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

Merge remote-tracking branch 'origin/master' into add_tinycc

Browse Source
This commit is contained in:
Bensuperpc 2021-08-05 16:58:52 +02:00
commit bd6d6d77d4
15 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common.windows
View File

@ -15,8 +15,8 @@
# ARG MXE_TARGET_LINK=shared
#
# mxe master 2021-07-07
ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298
# mxe master 2021-08-04
ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake

13
imagefiles/dockcross.sh
View File

@ -187,6 +187,8 @@ FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
# MSYS, Git Bash, etc.
MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "")
# CYGWIN
CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "")
if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then
USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )")
@ -209,6 +211,11 @@ elif [ -n "$MSYS" ]; then
HOST_PWD=$PWD
HOST_PWD=${HOST_PWD/\//}
HOST_PWD=${HOST_PWD/\//:\/}
elif [ -n "$CYGWIN" ]; then
for f in pwd readlink cygpath ; do
test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ;
done ;
HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
else
HOST_PWD=$PWD
[ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
@ -221,7 +228,11 @@ fi
HOST_VOLUMES=
if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then
HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh"
if test -n "${CYGWIN}" ; then
HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ;
else
HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ;
fi ;
fi
#------------------------------------------------------------------------------

4
linux-arm64/Dockerfile.in
View File

@ -4,8 +4,8 @@ FROM dockcross/base:latest
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
linux-armv5-musl/Dockerfile.in
View File

@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# musleabi as default glibc
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
linux-armv5/Dockerfile.in
View File

@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
linux-armv6/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
# This is for 32-bit ARMv6 Linux
# Raspberry Pi is ARMv6+VFP2

4
linux-armv7/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
# This is for 32-bit ARMv7 Linux
#include "common.crosstool"

4
linux-armv7a/Dockerfile.in
View File

@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# This is for 32-bit ARMv7 Linux
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
linux-m68k-uclibc/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
ARG QEMU_VERSION=6.0.0

4
linux-mips/Dockerfile.in
View File

@ -4,8 +4,8 @@ FROM dockcross/base:latest
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
linux-ppc64le/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
ARG QEMU_VERSION=6.0.0

4
linux-riscv32/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
ARG QEMU_VERSION=6.0.0

4
linux-riscv64/Dockerfile.in
View File

@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
ARG QEMU_VERSION=6.0.0

4
linux-s390x/Dockerfile.in
View File

@ -4,8 +4,8 @@ FROM dockcross/base:latest
# Crosstool-ng version
# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
# crosstool-ng master 2021-07-07
ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
# crosstool-ng master 2021-08-04
ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
#include "common.crosstool"

4
web-wasm/Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.25
FROM emscripten/emsdk:2.0.26
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.docker"
ENV EMSCRIPTEN_VERSION 2.0.25
ENV EMSCRIPTEN_VERSION 2.0.26
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \