diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-12-29 08:40:09 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:02:39 +1300 |
| commit | a875fd0d44f3cfedaa0037fb0351f26314887743 (patch) | |
| tree | f50c742695b442b0d5e92cf3362915379296b0ec | |
| parent | 86d3e59d7014aa2e3bf0da149e4a00e9c2fed7aa (diff) | |
| download | subsurface-a875fd0d44f3cfedaa0037fb0351f26314887743.tar.gz | |
Android build: always reconfigure libdivecomputer
This fix makes no difference from usage of this script in Travis
context, as every build starts from a clean VM, but the very few
developers that build for Android locally, and that want to use the new
style docker container builds as well, things are broken.
libdivecomputer has build artifacts in its source tree (and that source
tree is shared between local and docker run). So it happens that
libdivecomputer is configured locally, and afterwards fails to build
in docker build as its already configured, but not for the docker
image its now running in.
The fix is simple. Always reconfigure libdivecomputer when using this
script.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index 91bb2b7a8..5da08b533 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -126,12 +126,12 @@ if [ ! -d subsurface/libdivecomputer/src ] ; then popd fi -if [ ! -f subsurface/libdivecomputer/configure ] ; then - pushd subsurface/libdivecomputer - autoreconf --install - autoreconf --install - popd -fi +# always reconfigure here +rm -f subsurface/libdivecomputer/configure +pushd subsurface/libdivecomputer +autoreconf --install --force +autoreconf --install --force +popd # and now we need a monotonic build number... if [ ! -f ./buildnr.dat ] ; then |