diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-11-24 11:08:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | e77566e2629edc03eb399a73934386cc4f3bf346 (patch) | |
| tree | a67d185e0d193d1be6aec8fc97198e549d6798dd /packaging/android | |
| parent | 37476b34aa6d6b11f22f7014699479ee58b5caf2 (diff) | |
| download | subsurface-e77566e2629edc03eb399a73934386cc4f3bf346.tar.gz | |
Android build: build openssl before libzip
On very clean builds not using the wrapper script, the compile of libzip
simply fails because it depend on openssl include files. Simply swap them
around.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/build.sh | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 09f2af8ad..ee3aa8271 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -235,28 +235,6 @@ if [ "$QUICK" = "" ] ; then popd fi - "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip - 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" - pushd libzip-build-"$ARCH" - cmake \ - -DCMAKE_C_COMPILER="$CC" \ - -DCMAKE_LINKER="$CC" \ - -DCMAKE_INSTALL_PREFIX="$PREFIX" \ - -DCMAKE_INSTALL_LIBDIR="lib" \ - -DBUILD_SHARED_LIBS=OFF \ - ../libzip/ - make - make install - popd - fi "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then @@ -282,6 +260,29 @@ if [ "$QUICK" = "" ] ; then popd fi +"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip + 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" + pushd libzip-build-"$ARCH" + cmake \ + -DCMAKE_C_COMPILER="$CC" \ + -DCMAKE_LINKER="$CC" \ + -DCMAKE_INSTALL_PREFIX="$PREFIX" \ + -DCMAKE_INSTALL_LIBDIR="lib" \ + -DBUILD_SHARED_LIBS=OFF \ + ../libzip/ + make + make install + popd + fi + "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2 if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then # We don't want to find the HTTP_Parser package of the build host by mistake |