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 update_makefile

Browse Source
This commit is contained in:
Bensuperpc 2021-08-05 16:59:17 +02:00
commit d30a795408
17 changed files with 57 additions and 39 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 # ARG MXE_TARGET_LINK=shared
# #
# mxe master 2021-07-07 # mxe master 2021-08-04
ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298 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 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 "") UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "")
# MSYS, Git Bash, etc. # MSYS, Git Bash, etc.
MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "") 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 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 )") 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=$PWD
HOST_PWD=${HOST_PWD/\//} HOST_PWD=${HOST_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 else
HOST_PWD=$PWD HOST_PWD=$PWD
[ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD) [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
@ -221,7 +228,11 @@ fi
HOST_VOLUMES= HOST_VOLUMES=
if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then 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 fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

6
imagefiles/entrypoint.sh
View File

@ -7,13 +7,13 @@ if [[ $# == 0 ]]; then
# Presumably the image has been run directly, so help the user get # Presumably the image has been run directly, so help the user get
# started by outputting the dockcross script # started by outputting the dockcross script
if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then
head -n 2 /dockcross/dockcross head -n 2 /dockcross/dockcross.sh
echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE" echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE"
tail -n +4 /dockcross/dockcross | tail -n +4 /dockcross/dockcross.sh |
sed -e "s@dockcross\/linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE}@g" | sed -e "s@dockcross\/linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE}@g" |
sed -e "s@dockcross\-linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE//[\/:]/-}@g" sed -e "s@dockcross\-linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE//[\/:]/-}@g"
else else
cat /dockcross/dockcross cat /dockcross/dockcross.sh
fi fi
exit 0 exit 0
fi fi

4
linux-arm64/Dockerfile.in
View File

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

4
linux-armv5/Dockerfile.in
View File

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

4
linux-armv6/Dockerfile.in
View File

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

4
linux-mips/Dockerfile.in
View File

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

4
linux-ppc64le/Dockerfile.in
View File

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

4
linux-s390x/Dockerfile.in
View File

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

17
linux-x64-clang/Dockerfile.in
View File

@ -1,17 +1,24 @@
FROM dockcross/base:latest FROM dockcross/base:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# flang
ARG CLANG_VERSION=13
ENV CLANG_VERSION=${CLANG_VERSION}
RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
&& echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
&& echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
&& echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \ && apt-get update \
&& apt-get purge --autoremove -y gcc g++ software-properties-common \ && apt-get purge --autoremove -y gcc g++ software-properties-common \
&& apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \ && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} \
&& apt-get clean --yes \ && apt-get clean --yes \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \ && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \ && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \ && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \
&& cc --version \ && cc --version \
&& c++ --version \ && c++ --version \
&& cpp --version && cpp --version

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" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.docker" #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 PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \ ENV CC=/emsdk/upstream/emscripten/emcc \