From 8de521cfb58d9a6eef73cd9d88c2206d2720e430 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Tue, 14 Apr 2020 10:56:00 +0900
Subject: [PATCH] Use python3 instead
---
ci/android-install-ndk.sh | 2 +-
ci/docker/aarch64-linux-android/Dockerfile | 3 ++-
ci/docker/arm-linux-androideabi/Dockerfile | 3 ++-
ci/docker/asmjs-unknown-emscripten/Dockerfile | 3 ++-
ci/docker/i686-linux-android/Dockerfile | 3 ++-
ci/docker/wasm32-unknown-emscripten/Dockerfile | 5 ++++-
ci/docker/x86_64-linux-android/Dockerfile | 3 ++-
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh
index 71dd5bbb..c5594e18 100644
--- a/ci/android-install-ndk.sh
+++ b/ci/android-install-ndk.sh
@@ -33,7 +33,7 @@ case "$1" in
;;
esac;
-${NDK}/build/tools/make_standalone_toolchain.py \
+python3 ${NDK}/build/tools/make_standalone_toolchain.py \
--install-dir "/android/ndk-${1}" \
--arch "${arch}" \
--api ${api}
diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile
index 33b84100..776a2509 100644
--- a/ci/docker/aarch64-linux-android/Dockerfile
+++ b/ci/docker/aarch64-linux-android/Dockerfile
@@ -6,7 +6,8 @@ RUN dpkg --add-architecture i386 && \
file \
curl \
ca-certificates \
- python \
+ python3 \
+ python3-distutils \
unzip \
expect \
openjdk-8-jre \
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
index 66d7b703..5678f4f1 100644
--- a/ci/docker/arm-linux-androideabi/Dockerfile
+++ b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -6,7 +6,8 @@ RUN dpkg --add-architecture i386 && \
file \
curl \
ca-certificates \
- python \
+ python3 \
+ python3-distutils \
unzip \
expect \
openjdk-8-jre \
diff --git a/ci/docker/asmjs-unknown-emscripten/Dockerfile b/ci/docker/asmjs-unknown-emscripten/Dockerfile
index 8f5ff618..57419a36 100644
--- a/ci/docker/asmjs-unknown-emscripten/Dockerfile
+++ b/ci/docker/asmjs-unknown-emscripten/Dockerfile
@@ -8,7 +8,8 @@ RUN apt-get update && \
git \
libc6-dev \
libxml2 \
- python \
+ python3 \
+ python3-distutils \
xz-utils
COPY emscripten.sh /
diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
index 4eee094c..9c050ef9 100644
--- a/ci/docker/i686-linux-android/Dockerfile
+++ b/ci/docker/i686-linux-android/Dockerfile
@@ -6,7 +6,8 @@ RUN dpkg --add-architecture i386 && \
file \
curl \
ca-certificates \
- python \
+ python3 \
+ python3-distutils \
unzip \
expect \
openjdk-8-jre \
diff --git a/ci/docker/wasm32-unknown-emscripten/Dockerfile b/ci/docker/wasm32-unknown-emscripten/Dockerfile
index a8da10f9..52e0c3e5 100644
--- a/ci/docker/wasm32-unknown-emscripten/Dockerfile
+++ b/ci/docker/wasm32-unknown-emscripten/Dockerfile
@@ -11,12 +11,15 @@ RUN apt-get update && \
git \
libc6-dev \
libxml2 \
- python \
+ python3 \
+ python3-distutils \
cmake \
sudo \
gdb \
xz-utils
+RUN ln -s /usr/bin/python3 /usr/bin/python & \
+ ln -s /usr/bin/pip3 /usr/bin/pip
COPY emscripten.sh /
RUN bash /emscripten.sh
diff --git a/ci/docker/x86_64-linux-android/Dockerfile b/ci/docker/x86_64-linux-android/Dockerfile
index b7dd19e1..87263bce 100644
--- a/ci/docker/x86_64-linux-android/Dockerfile
+++ b/ci/docker/x86_64-linux-android/Dockerfile
@@ -6,7 +6,8 @@ RUN apt-get update && \
curl \
gcc \
libc-dev \
- python \
+ python3 \
+ python3-distutils \
unzip
WORKDIR /android/
--
GitLab