From 6d88da58f193d5310cc579c8792a12bc09a69939 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 26 Sep 2022 15:50:53 +0900 Subject: [PATCH 1/3] PATH is required by OpenSSL only --- Dockerfile.android | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.android b/Dockerfile.android index 542d049a..c789d063 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -27,7 +27,6 @@ ENV LD $TOOLCHAIN/bin/ld ENV RANDLIB $TOOLCHAIN/bin/llvm-ranlib ENV STRIP $TOOLCHAIN/bin/llvm-strip ENV PREFIX /root/usr/local -ENV PATH $TOOLCHAIN/bin:$PATH WORKDIR /root RUN apt-get update && \ @@ -55,7 +54,7 @@ RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && rm openssl-$OPENSSL_VERSION.tar.gz WORKDIR /root/build/openssl-$OPENSSL_VERSION -RUN export ANDROID_NDK_HOME=$NDK && \ +RUN export ANDROID_NDK_HOME=$NDK PATH=$TOOLCHAIN/bin:$PATH && \ ./Configure --prefix=$PREFIX android-arm64 && \ make && make install_sw From d3381233b10b82a05369b353664bbaf339ff7e05 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 26 Sep 2022 16:09:15 +0900 Subject: [PATCH 2/3] Do not create OpenSSL shared library --- Dockerfile.android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.android b/Dockerfile.android index c789d063..3cea3698 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -55,7 +55,7 @@ RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && WORKDIR /root/build/openssl-$OPENSSL_VERSION RUN export ANDROID_NDK_HOME=$NDK PATH=$TOOLCHAIN/bin:$PATH && \ - ./Configure --prefix=$PREFIX android-arm64 && \ + ./Configure no-shared --prefix=$PREFIX android-arm64 && \ make && make install_sw WORKDIR /root/build From c06f1e997448bef19ba65afbed5d48e4ea44df7d Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 26 Sep 2022 16:16:34 +0900 Subject: [PATCH 3/3] Remove --with-xml-prefix --- Dockerfile.android | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.android b/Dockerfile.android index 3cea3698..f2e66c41 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -111,7 +111,6 @@ RUN autoreconf -i && \ --disable-shared \ --host=$TARGET \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \ - --with-xml-prefix="$PREFIX" \ --without-libxml2 \ --disable-python-bindings \ --disable-examples \