Merge remote-tracking branch 'origin/main'

scripts/android/build_boost.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 
 . ./config.sh
-BOOST_SRC_DIR=$WORKDIR/boost_1_74_0
-BOOST_FILENAME=boost_1_74_0.tar.bz2
-BOOST_VERSION=1.74.0
+BOOST_SRC_DIR=$WORKDIR/boost_1_75_0
+BOOST_FILENAME=boost_1_75_0.tar.bz2
+BOOST_VERSION=1.75.0
 
 for arch in "aarch" "aarch64" "i686" "x86_64"
 do

scripts/android/build_openssl.sh

@@ -51,7 +51,7 @@ CC=clang ANDROID_NDK=$TOOLCHAIN \
 	--openssldir=${PREFIX} \
 	-D__ANDROID_API__=$API 
 make -j$THREADS
-make install
+make -j$THREADS install_sw
 
 done
 

scripts/android/init_boost.sh

@@ -6,7 +6,7 @@ BOOST_SRC_DIR=$3
 BOOST_FILENAME=$4
 BOOST_VERSION=$5
 BOOST_FILE_PATH=$WORKDIR/$BOOST_FILENAME
-BOOST_SHA256="83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"
+BOOST_SHA256="953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"
 
 if [ ! -e "$BOOST_FILE_PATH" ]; then
 	curl -L http://downloads.sourceforge.net/project/boost/boost/${BOOST_VERSION}/${BOOST_FILENAME} > $BOOST_FILE_PATH
@@ -16,6 +16,7 @@ echo $BOOST_SHA256 $BOOST_FILE_PATH | sha256sum -c - || exit 1
 
 cd $WORKDIR
 rm -rf $BOOST_SRC_DIR
+rm -rf $PREFIX/include/boost
 tar -xvf $BOOST_FILE_PATH -C $WORKDIR
 cd $BOOST_SRC_DIR
 ./bootstrap.sh --prefix=${PREFIX}