aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-01-20 21:47:06 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-01-21 14:28:26 -0800
commit8adcc406c7ea18992c4695b99cead112d0cc673a (patch)
tree9e2e3b522a27372b2bcac6b6a31a47c9a6e4cf36
parenta69852e56dd993c05a1e1a9f7af35bb466274011 (diff)
downloadsubsurface-8adcc406c7ea18992c4695b99cead112d0cc673a.tar.gz
Android build.sh: don't try to link against host http_parser
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--packaging/android/build.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index ea5bc3f79..11ec14e78 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -220,6 +220,8 @@ if [ ! -e libgit2-${LIBGIT2_VERSION} ] ; then
tar -zxf libgit2-${LIBGIT2_VERSION}.tar.gz
fi
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-${LIBGIT2_VERSION}/CMakeLists.txt
mkdir -p libgit2-build-$ARCH
pushd libgit2-build-$ARCH
cmake -DCMAKE_SYSTEM_NAME=Android -DSHA1_TYPE=builtin \