summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-03-06 10:08:36 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-03-06 11:03:11 -0800
commit8d9bffff640379d9d15da2a5185c9c3b44264f5e (patch)
treeb298c10855f794570b5ef3b16f174937809d9809
parentc27a2b47f4b5a68a8ba8167996b73a4638454dcc (diff)
downloadsubsurface-8d9bffff640379d9d15da2a5185c9c3b44264f5e.tar.gz
iOS build: fix libdivecomputer build
This uses new configure options added to the Subsurface-branch of libdivecomputer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--packaging/ios/build.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh
index a890d3997..4636c4cec 100644
--- a/packaging/ios/build.sh
+++ b/packaging/ios/build.sh
@@ -307,15 +307,15 @@ if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up"
exit 1
fi
+if [ ! -f configure ] ; then
+ autoreconf --install
+fi
cd ..
if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then
- if [ ! -f ../libvidecomputer/configure ] ; then
- autoreconf --install ../libdivecomputer
- fi
mkdir -p libdivecomputer-build-$ARCH
pushd libdivecomputer-build-$ARCH
- ../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no
+ ../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --disable-libusb --disable-hidapi
make
make install
popd