mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Merge pull request #537 from bensuperpc/update_crosstool-ng-mxe
Update crosstool-ng, mxe and wasm
This commit is contained in:
commit
53dbfc89e1
@ -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
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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,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"
|
||||||
|
|
||||||
|
@ -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,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"
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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,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"
|
||||||
|
|
||||||
|
@ -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 \
|
||||||
|
Loading…
Reference in New Issue
Block a user