Update OpenSSL, add unbound for android build scripts
M committed
Aug 9, 2022 at 17:31 UTC
8919fdc4d29be71d1ad17feebbc6297291aff60c
4 files changed
+71
-6
scripts/android/build_monero.sh
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
. ./config.sh
4
-MONERO_BRANCH=release-v0.17.3.2-android
4
+MONERO_BRANCH=release-v0.18.0.0-android
5
MONERO_SRC_DIR=${WORKDIR}/monero
6
7
git clone https://github.com/cake-tech/monero.git ${MONERO_SRC_DIR} --branch ${MONERO_BRANCH}
scripts/android/build_monero_all.sh
+1
@@ -4,5 +4,6 @@
4
./build_boost.sh
5
./build_openssl.sh
6
./build_sodium.sh
7
+./build_unbound.sh
8
./build_zmq.sh
9
./build_monero.sh
scripts/android/build_openssl.sh
+4
-5
@@ -3,10 +3,10 @@
3
set -e
4
5
. ./config.sh
6
-OPENSSL_FILENAME=openssl-1.1.1k.tar.gz
6
+OPENSSL_FILENAME=openssl-1.1.1q.tar.gz
7
OPENSSL_FILE_PATH=$WORKDIR/$OPENSSL_FILENAME
8
-OPENSSL_SRC_DIR=$WORKDIR/openssl-1.1.1k
9
-OPENSSL_SHA256="892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"
8
+OPENSSL_SRC_DIR=$WORKDIR/openssl-1.1.1q
9
+OPENSSL_SHA256="d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca"
10
ZLIB_DIR=$WORKDIR/zlib
11
ZLIB_TAG=v1.2.11
12
ZLIB_COMMIT_HASH="cacf7f1d4e3d44d871b605da3b647f07d718623f"
@@ -40,10 +40,9 @@ rm -rf $OPENSSL_SRC_DIR
40
tar -xzf $OPENSSL_FILE_PATH -C $WORKDIR
41
cd $OPENSSL_SRC_DIR
42
43
-sed -i -e "s/mandroid/target\ ${TARGET}\-linux\-android/" Configure
43
CC=clang ANDROID_NDK=$TOOLCHAIN \
44
./Configure ${X_ARCH} \
46
- no-asm no-shared \
45
+ no-shared no-tests \
46
--with-zlib-include=${PREFIX}/include \
47
--with-zlib-lib=${PREFIX}/lib \
48
--prefix=${PREFIX} \
scripts/android/build_unbound.sh
new
+65
@@ -0,0 +1,65 @@
1
+#!/bin/bash
2
+
3
+. ./config.sh
4
+
5
+EXPAT_VERSION=R_2_4_8
6
+EXPAT_HASH="3bab6c09bbe8bf42d84b81563ddbcf4cca4be838"
7
+EXPAT_SRC_DIR=$WORKDIR/libexpat
8
+
9
+for arch in "aarch" "aarch64" "i686" "x86_64"
10
+do
11
+PREFIX=$WORKDIR/prefix_${arch}
12
+TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
13
+PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
14
+
15
+cd $WORKDIR
16
+rm -rf $EXPAT_SRC_DIR
17
+git clone https://github.com/libexpat/libexpat.git -b ${EXPAT_VERSION} ${EXPAT_SRC_DIR}
18
+cd $EXPAT_SRC_DIR
19
+test `git rev-parse HEAD` = ${EXPAT_HASH} || exit 1
20
+cd $EXPAT_SRC_DIR/expat
21
+
22
+case $arch in
23
+ "aarch") HOST="arm-linux-androideabi";;
24
+ "i686") HOST="x86-linux-android";;
25
+ *) HOST="${arch}-linux-android";;
26
+esac
27
+
28
+./buildconf.sh
29
+CC=clang CXX=clang++ ./configure --enable-static --disable-shared --prefix=${PREFIX} --host=${HOST}
30
+make -j$THREADS
31
+make -j$THREADS install
32
+done
33
+
34
+UNBOUND_VERSION=release-1.16.2
35
+UNBOUND_HASH="cbed768b8ff9bfcf11089a5f1699b7e5707f1ea5"
36
+UNBOUND_SRC_DIR=$WORKDIR/unbound-1.16.2
37
+
38
+for arch in "aarch" "aarch64" "i686" "x86_64"
39
+do
40
+PREFIX=$WORKDIR/prefix_${arch}
41
+TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
42
+
43
+case $arch in
44
+ "aarch") TOOLCHAIN_BIN_PATH=${TOOLCHAIN_BASE_DIR}_${arch}/arm-linux-androideabi/bin;;
45
+ *) TOOLCHAIN_BIN_PATH=${TOOLCHAIN_BASE_DIR}_${arch}/${arch}-linux-android/bin;;
46
+esac
47
+
48
+PATH="${TOOLCHAIN_BIN_PATH}:${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
49
+echo $PATH
50
+cd $WORKDIR
51
+rm -rf $UNBOUND_SRC_DIR
52
+git clone https://github.com/NLnetLabs/unbound.git -b ${UNBOUND_VERSION} ${UNBOUND_SRC_DIR}
53
+cd $UNBOUND_SRC_DIR
54
+test `git rev-parse HEAD` = ${UNBOUND_HASH} || exit 1
55
+
56
+case $arch in
57
+ "aarch") HOST="arm-linux-androideabi";;
58
+ "i686") HOST="x86-linux-android";;
59
+ *) HOST="${arch}-linux-android";;
60
+esac
61
+
62
+CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${HOST} --enable-static --disable-shared --disable-flto --with-ssl=${PREFIX} --with-libexpat=${PREFIX}
63
+make -j$THREADS
64
+make -j$THREADS install
65
+done