mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: build latest libzip

Browse source 
Small hacks needed, but otherwise this seems to work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-08-05 15:07:46 -07:00
parent 9328726358
commit 32a630ece3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packaging/android/build.sh
View file

@ -216,6 +216,13 @@ fi
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
# libzip expects a predefined macro that isn't there for our compiler
pushd libzip
git reset --hard
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)//;s/FIND_PACKAGE(BZip2)/# FIND_PACKAGE(BZip2)/' CMakeLists.txt
popd
mkdir -p libzip-build-"$ARCH" mkdir -p libzip-build-"$ARCH"
pushd libzip-build-"$ARCH" pushd libzip-build-"$ARCH"
cmake \ cmake \

1
scripts/get-dep-lib.sh
View file

@ -100,7 +100,6 @@ fi
# FIX FOR ANDROID, # FIX FOR ANDROID,
if [ "$PLATFORM" == "singleAndroid" ] ; then if [ "$PLATFORM" == "singleAndroid" ] ; then
CURRENT_LIBZIP="rel-1-1-3"
CURRENT_OPENSSL="OpenSSL_1_0_2o" CURRENT_OPENSSL="OpenSSL_1_0_2o"
# If changing the openSSL version here, make sure to change it in versions.sh also. # If changing the openSSL version here, make sure to change it in versions.sh also.
fi fi