From f179ec033f39a6b774e6e6bb79f41771dfaf7e02 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Thu, 7 Nov 2019 13:13:36 +0100 Subject: 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 --- scripts/build.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'scripts/build.sh') 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 -- cgit v1.2.3-70-g09d2