Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

[Android] Fix armv6 vcpkg build. 

Use curl 7.80.0 for non-vcpkg Android build.

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2021-11-24 23:45:18 +01:00
parent bd32d117ed
commit 9208bca72c
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/buildAndroidBOINC-CI.sh
View File

@ -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

2
android/build_boinc_armv6.sh
View File

@ -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