diff options
| author |  jan Iversen <jan@casacondor.com> | 2019-11-07 13:13:36 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-08 23:09:57 +0100 |
| commit | f179ec033f39a6b774e6e6bb79f41771dfaf7e02 (patch) | |
| tree | 3adec53c811e3e29b5524128c51e14406cfeb7aa | |
| parent | 2c11544d9321398f67469085257db6b6114fb992 (diff) | |
| download | subsurface-f179ec033f39a6b774e6e6bb79f41771dfaf7e02.tar.gz | |
scripts: update get-deps to allow clean build
libssh2 depends on openssl, therefore it is important that openssl is
build before libssh2.
The old get-deps would cause errors in 2 situations:
1) In a clean build, make of libssh2 would fail
2) In a normal build, where openssl changed version, make of libssh2 would
depend on old build.
Signed-off-by: Jan Iversen <jan@casacondor.com>
| -rwxr-xr-x | scripts/build.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 890db3b48..24e075f25 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -237,6 +237,17 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then make install popd + ./subsurface/scripts/get-dep-lib.sh single . openssl + pushd openssl + mkdir -p build + cd build + ../Configure --prefix=$INSTALL_ROOT --openssldir=$INSTALL_ROOT $OLDER_MAC darwin64-x86_64-cc + make depend + # all the tests fail because the assume that openssl is already installed. Odd? Still thinks work + make -j4 -k + make -k install + popd + ./subsurface/scripts/get-dep-lib.sh single . libssh2 pushd libssh2 mkdir -p build @@ -315,17 +326,6 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then make -j4 make install popd - - ./subsurface/scripts/get-dep-lib.sh single . openssl - pushd openssl - mkdir -p build - cd build - ../Configure --prefix=$INSTALL_ROOT --openssldir=$INSTALL_ROOT $OLDER_MAC darwin64-x86_64-cc - make depend - # all the tests fail because the assume that openssl is already installed. Odd? Still thinks work - make -j4 -k - make -k install - popd fi |