diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-05-08 11:23:56 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-10 20:43:22 -0700 |
| commit | a0030a488aafc74d36ce7511db9da229010ce528 (patch) | |
| tree | cd399ca3bb6f28597af52523912f0f0f0919c979 | |
| parent | c67fe97ba13a1dcf0f9bc742a9d5d0969937481c (diff) | |
| download | subsurface-a0030a488aafc74d36ce7511db9da229010ce528.tar.gz | |
iOS: build.sh does not run configure for libdivecomputer
In a "virgin" repo incl. libdivecomputer, starting by running
ios/build.sh caused an error in libdivecomputer,
because autoreconf was never run.
Changed build.sh to check if libdivecomputer/configure exist, if
not run autoreconf
Signed-off-by: Jan Iversen <jani@apache.org>
| -rwxr-xr-x | packaging/ios/build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index bef6904a2..a6197fbe7 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -281,17 +281,18 @@ echo next building for $ARCH if [ ! -d ../../libdivecomputer/src ] ; then pushd ../.. git submodule init - git submodule update --recursive - pushd libdivecomputer + popd + fi + git submodule update --recursive + if [ ! -f ../../libdivecomputer/configure ] ; then + pushd ../../libdivecomputer autoreconf --install autoreconf --install popd - popd fi if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then echo "" > libdivecomputer-${ARCH}.SHA fi - git submodule update --recursive CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA) if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then |