diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2015-07-09 00:42:11 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-07-08 15:48:30 -0700 |
| commit | 1f112c7738603269b47085d93c02d1a703b18618 (patch) | |
| tree | 966089f62e6ea5bc72998b108d26eacfd8106223 /packaging | |
| parent | a558f09f8d3a074b313fa7a17e27473c8bb76e20 (diff) | |
| download | subsurface-1f112c7738603269b47085d93c02d1a703b18618.tar.gz | |
Make the libssh linking optional
Due to bugs in libgit2, we force linking with libssh2 to add
git-over-ssh support. On android we currency don't want libssh2 due to
its dependency chain, so this makes the libssh2 force linking opt-out.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/android/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 00263d4fb..b70704f45 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -158,7 +158,7 @@ fi mkdir -p subsurface-build-$ARCH cd subsurface-build-$ARCH -cmake -DCMAKE_SYSTEM_NAME=Android -DLIBDC_FROM_PKGCONFIG=ON -DLIBGIT2_FROM_PKGCONFIG=ON -DUSE_LIBGIT23_API=ON -DNO_MARBLE=ON -DNO_PRINTING=ON -DNO_USERMANUAL=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake $SUBSURFACE_SOURCE +cmake -DCMAKE_SYSTEM_NAME=Android -DFORCE_LIBSSH=OFF -DLIBDC_FROM_PKGCONFIG=ON -DLIBGIT2_FROM_PKGCONFIG=ON -DUSE_LIBGIT23_API=ON -DNO_MARBLE=ON -DNO_PRINTING=ON -DNO_USERMANUAL=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake $SUBSURFACE_SOURCE make #make install INSTALL_ROOT=android_build # bug in androiddeployqt? why is it looking for something with the builddir in it? |