Fix musl

Fix musl

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

android-arm/Dockerfile.in

@@ -16,8 +16,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 33
 
 RUN mkdir -p /build && \
     cd /build && \
@@ -26,7 +26,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \
-      --api ${ANDROID_NDK_API} \
+      --api ${ANDROID_API} \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

android-arm64/Dockerfile.in

@@ -20,8 +20,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 33
 
 RUN mkdir -p /build && \
     cd /build && \
@@ -30,7 +30,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm64 \
-      --api ${ANDROID_NDK_API} \
+      --api ${ANDROID_API} \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

android-x86/Dockerfile

@@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 33
 
 RUN mkdir -p /build && \
     cd /build && \
@@ -21,7 +21,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86 \
-      --api ${ANDROID_NDK_API} \
+      --api ${ANDROID_API} \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

android-x86_64/Dockerfile

@@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 33
 
 RUN mkdir -p /build && \
     cd /build && \
@@ -21,7 +21,7 @@ RUN mkdir -p /build && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86_64 \
-      --api ${ANDROID_NDK_API} \
+      --api ${ANDROID_API} \
       --stl=libc++ \
       --install-dir=${CROSS_ROOT} && \
     cd / && \

linux-arm64-musl/Dockerfile.in

@@ -5,7 +5,7 @@ ENV CROSS_TRIPLE aarch64-linux-musl
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \

linux-armv6-musl/Dockerfile.in

@@ -5,7 +5,7 @@ ENV CROSS_TRIPLE armv6-linux-musleabihf
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \

linux-armv7l-musl/Dockerfile.in

@@ -5,7 +5,7 @@ ENV CROSS_TRIPLE armv7l-linux-musleabihf
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
 
 RUN mkdir -p ${XCC_PREFIX}
-RUN curl -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
 RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \