diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-02-08 14:41:42 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-02-09 16:48:55 -0800 |
| commit | 67933e68ddca460653f69355306fffd865abc3ec (patch) | |
| tree | 17134dfda8a823b30db23e923acf642413d3a1e9 /packaging/ios | |
| parent | 6fed3d65173953643be268e8c08b22f9d31aa2fa (diff) | |
| download | subsurface-67933e68ddca460653f69355306fffd865abc3ec.tar.gz | |
build-system/iOS: don't build libdivecomputer inside the source tree
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/ios')
| -rwxr-xr-x | packaging/ios/build.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 63bf1a64e..b57d879f5 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -216,16 +216,16 @@ for ARCH in $ARCHS; do autoreconf --install popd fi - mkdir -p ../../libdivecomputer/build-ios/$ARCH - if [ ! -f ../../libdivecomputer/build-ios/${ARCH}/git.SHA ] ; then - echo "" > ../../libdivecomputer/build-ios/${ARCH}/git.SHA + mkdir -p ${PARENT_DIR}/libdivecomputer-build-ios/$ARCH + if [ ! -f ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA ] ; then + echo "" > ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA fi CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) - PREVIOUS_SHA=$(cat ../../libdivecomputer/build-ios/${ARCH}/git.SHA) + PREVIOUS_SHA=$(cat ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA) if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then - echo $CURRENT_SHA > ../../libdivecomputer/build-ios/${ARCH}/git.SHA - pushd ../../libdivecomputer/build-ios/$ARCH - ../../configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble + echo $CURRENT_SHA > ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA + pushd ${PARENT_DIR}/libdivecomputer-build-ios/$ARCH + ${SUBSURFACE_SOURCE}/libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble make make install popd |