Update emscripten/emsdk to 2.0.27

Update emscripten/emsdk to 2.0.27 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Merge pull request #563 from bensuperpc/Update_android
2025-06-18 17:09:25 +02:00 · 2021-08-22 21:40:31 +02:00 · 2021-08-22 11:30:02 +02:00 · 2021-08-22 06:27:55 +02:00 · 2021-08-21 22:54:17 +02:00 · 2021-08-21 20:48:52 +02:00
5 changed files with 22 additions and 18 deletions
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@ -17,12 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 RUN mkdir -p /build && \
    cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
    ./build/tools/make_standalone_toolchain.py \
      --arch arm \
--- a/android-arm64/Dockerfile.in
+++ b/android-arm64/Dockerfile.in
@ -21,12 +21,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 RUN mkdir -p /build && \
    cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
    ./build/tools/make_standalone_toolchain.py \
      --arch arm64 \
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 RUN mkdir -p /build && \
    cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
    ./build/tools/make_standalone_toolchain.py \
      --arch x86 \
--- a/android-x86_64/Dockerfile
+++ b/android-x86_64/Dockerfile
@ -12,12 +12,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

-ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 22
+ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_API 23
+
 RUN mkdir -p /build && \
    cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
    cd android-ndk-r${ANDROID_NDK_REVISION} && \
    ./build/tools/make_standalone_toolchain.py \
      --arch x86_64 \
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.26
+FROM emscripten/emsdk:2.0.27
 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.26
+ENV EMSCRIPTEN_VERSION 2.0.27

 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \
Author	SHA1	Message	Date
Bensuperpc	7504651dad	Update emscripten/emsdk to 2.0.27 Update emscripten/emsdk to 2.0.27 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-22 21:40:31 +02:00
Bensuperpc	9c713ea6b5	Merge pull request #563 from bensuperpc/Update_android Update android NDK to r23 (August 2021)	2021-08-22 11:30:02 +02:00
Bensuperpc	7427f07a27	Merge pull request #564 from bensuperpc/add_x86_64-full Add linux-x86_64-full and minor fix	2021-08-22 06:27:55 +02:00
Bensuperpc	dd60bbb440	Fix wrong url Fix wrong url Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-21 22:54:17 +02:00
Bensuperpc	8c081be13b	Update android NDK to r23 (August 2021) Update android NDK to r23 (August 2021) Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-21 20:48:52 +02:00