diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-03 12:58:56 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-12-03 14:12:06 -0800 |
| commit | 0ce44b8ed1509c775f5f20ae752a52c1016a09e7 (patch) | |
| tree | a138e803443d9788f835ba1a874e842510e79b5c | |
| parent | 25041be08c8b5729ce2d6f2b0a07a5c7fab65132 (diff) | |
| download | subsurface-0ce44b8ed1509c775f5f20ae752a52c1016a09e7.tar.gz | |
libdc: update the iOS build script for submodule
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/ios/build.sh | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 9510936fb..216c5fc07 100644 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -259,24 +259,19 @@ echo next building for $ARCH # # build libdivecomputer - if [ ! -d libdivecomputer ] ; then - git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer - fi - cd libdivecomputer - git pull --rebase - 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 + if [ ! -d ../../../libdivecomputer/src ] ; then + pushd ../../.. + git submodule update --recursive + pushd libdivecomputer + autoreconf --install autoreconf --install + popd + popd fi - cd .. - if [ ! -e $PKG_CONFIG_LIBDIR/libdivecomputer.pc ] ; then mkdir -p libdivecomputer-build-$ARCH pushd libdivecomputer-build-$ARCH - ../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi + ../../../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi make make install popd |