diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-11-24 10:29:39 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | 13f108c9dd024ac1b12f84cda7362344caada8dd (patch) | |
| tree | 91d65eedc43e015608cefc8dc2f4c25610087999 | |
| parent | 1429629567c0afdcd3284fbe4973d76add9a8549 (diff) | |
| download | subsurface-13f108c9dd024ac1b12f84cda7362344caada8dd.tar.gz | |
Android build: openssl, do not move source tree
Very annoyingly, openssl is re-build and downloaded numerous times
when doing partial builds. Reason for this, is that the original checked
out git repo is moved away, and build in source (as openssl does ...).
So, this simple change leaves the checked out repo in place, and
copies the tree to build in.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rwxr-xr-x | packaging/android/build.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 9a2d27ad1..cd869941e 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -254,10 +254,9 @@ if [ "$QUICK" = "" ] ; then fi "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl - if [ ! -e openssl-build-"$ARCH" ] ; then - mv openssl openssl-build-"$ARCH" - fi if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then + mkdir -p openssl-build-"$ARCH" + cp -r openssl/* openssl-build-"$ARCH" pushd openssl-build-"$ARCH" perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org # Use env to make all these temporary, so they don't pollute later builds. |