From a30e6b306f446d292b319b83892494bc23195cd9 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Fri, 27 Sep 2019 20:46:19 +0200 Subject: android-build: Add some more libzip hacks This hacks the libzip build to not try to find zlib, because it fails doing so on modern NDK. We just tell it that its there, and be done with it. Signed-off-by: Anton Lundin --- packaging/android/build.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packaging/android/build.sh') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 31cd058fe..4c97be75d 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -281,6 +281,7 @@ if [ "$QUICK" = "" ] ; then sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h # also, don't deal with manuals and bzip2 sed -i 's/ADD_SUBDIRECTORY(man)//' CMakeLists.txt + sed -i 's/^FIND_PACKAGE(ZLIB/#&/' CMakeLists.txt popd mkdir -p libzip-build-"$ARCH" pushd libzip-build-"$ARCH" @@ -291,6 +292,8 @@ if [ "$QUICK" = "" ] ; then -DCMAKE_INSTALL_LIBDIR="lib" \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \ + -DZLIB_VERSION_STRING=1.2.7 \ + -DZLIB_LIBRARY=z \ ../libzip/ make make install -- cgit v1.2.3-70-g09d2