diff --git a/android/buildAndroidBOINC-CI.sh b/android/buildAndroidBOINC-CI.sh index ad3a68eef3..99c78a06b8 100755 --- a/android/buildAndroidBOINC-CI.sh +++ b/android/buildAndroidBOINC-CI.sh @@ -23,7 +23,7 @@ set -e export REV=1 export ARMV6_REV=1 export OPENSSL_VERSION=1.1.1l -export CURL_VERSION=7.78.0 +export CURL_VERSION=7.80.0 export NDK_VERSION=21d export NDK_ARMV6_VERSION=15c @@ -306,7 +306,7 @@ vcpkgDir() arch=$1 shift vcpkg_dir="$VCPKG_ROOT/installed" - + if [ $arch = "armv6" ]; then vcpkg_dir="$vcpkg_dir/armv6-android" elif [ $arch = "arm" ]; then diff --git a/android/build_boinc_armv6.sh b/android/build_boinc_armv6.sh index 77e8bb17a4..27f510f425 100755 --- a/android/build_boinc_armv6.sh +++ b/android/build_boinc_armv6.sh @@ -79,6 +79,8 @@ if [ -n "$COMPILEBOINC" ]; then export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc" fi ./configure --host=armv6-linux --with-boinc-platform="arm-android-linux-gnu" $CONFIG_FLAGS --disable-server --disable-manager --disable-shared --enable-static --disable-largefile + sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out + mv client/Makefile.out client/Makefile fi echo MAKE_FLAGS=$MAKE_FLAGS make $MAKE_FLAGS