summaryrefslogtreecommitdiffstats
path: root/packaging/android
diff options
context:
space:
mode:
authorGravatar Rolf Eike Beer <eike@sf-mail.de>2019-03-04 18:50:19 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-05 13:27:54 -0800
commit9bbb6f785ca480c639439acb32bdcbff62c438ae (patch)
treefbeedd7aade8119bf420b01901299522c04ce46a /packaging/android
parentaa7f9a18f2fd300fb4adfa5eeb1ebb27b23b7328 (diff)
downloadsubsurface-9bbb6f785ca480c639439acb32bdcbff62c438ae.tar.gz
CMake: just tell CMake to not find HTTP_Parser
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'packaging/android')
-rwxr-xr-xpackaging/android/build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 8e0c410ea..6f2ae8e1f 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -287,7 +287,6 @@ if [ "$QUICK" = "" ] ; then
"${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
- perl -pi -e 's/FIND_PACKAGE\(HTTP_Parser\)/#FIND_PACKAGE(HTTP_Parser)/' libgit2/CMakeLists.txt
mkdir -p libgit2-build-"$ARCH"
pushd libgit2-build-"$ARCH"
cmake \
@@ -301,6 +300,7 @@ if [ "$QUICK" = "" ] ; then
-DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto.so \
-DOPENSSL_INCLUDE_DIR="$PREFIX"/include/openssl \
-D_OPENSSL_VERSION="${OPENSSL_VERSION}" \
+ -DCMAKE_DISABLE_FIND_PACKAGE_HTTP_Parser=TRUE \
../libgit2/
make
make install