mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

iOS: build.sh does not run configure for libdivecomputer

Browse source 
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>
This commit is contained in:
jan Iversen 2018-05-08 11:23:56 +02:00 • committed by Dirk Hohndel
parent c67fe97ba1
commit a0030a488a
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packaging/ios/build.sh
View file

@ -281,17 +281,18 @@ echo next building for $ARCH
if [ ! -d ../../libdivecomputer/src ] ; then if [ ! -d ../../libdivecomputer/src ] ; then
pushd ../.. pushd ../..
git submodule init git submodule init
git submodule update --recursive
pushd libdivecomputer
autoreconf --install
autoreconf --install
popd popd
fi
git submodule update --recursive
if [ ! -f ../../libdivecomputer/configure ] ; then
pushd ../../libdivecomputer
autoreconf --install
autoreconf --install
popd popd
fi fi
if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then
echo "" > libdivecomputer-${ARCH}.SHA echo "" > libdivecomputer-${ARCH}.SHA
fi fi
git submodule update --recursive
CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) CURRENT_SHA=$(cd ../../libdivecomputer ; git describe)
PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA) PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA)
if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then