From 93983b7e4c0ad72c61c98a87132c6274b4640c16 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 4 Aug 2018 14:30:42 -0700 Subject: Android: build libzip 1.1.3 Switching to GitHub as source for libzip means that we need to encode the version number differently. Newer versions of libzip don't compile cleanly on Android and this one seems new enough. Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 7 ++++++- scripts/get-dep-lib.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 89ea832af..3d62c4520 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -218,7 +218,12 @@ fi if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then mkdir -p libzip-build-"$ARCH" pushd libzip-build-"$ARCH" - ../libzip/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared + cmake \ + -DCMAKE_C_COMPILER="$CC" \ + -DCMAKE_LINKER="$CC" \ + -DCMAKE_INSTALL_PREFIX="$PREFIX" \ + -DBUILD_SHARED_LIBS=OFF \ + ../libzip/ make make install popd diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index 5bd3f2494..e87b294cf 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -100,7 +100,7 @@ fi # FIX FOR ANDROID, if [ "$PLATFORM" == "singleAndroid" ] ; then - CURRENT_LIBZIP="1.1.3" + CURRENT_LIBZIP="rel-1-1-3" CURRENT_OPENSSL="OpenSSL_1_0_2o" # If changing the openSSL version here, make sure to change it in versions.sh also. fi -- cgit v1.2.3-70-g09d2