summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-04 14:30:42 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-04 14:32:16 -0700
commit93983b7e4c0ad72c61c98a87132c6274b4640c16 (patch)
treed4f6a491461c0d1585ff40042c4d1676884133f0 /packaging
parent8df6789a9d4284c360146c53d24e56d442006237 (diff)
downloadsubsurface-93983b7e4c0ad72c61c98a87132c6274b4640c16.tar.gz
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 <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/android/build.sh7
1 files changed, 6 insertions, 1 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