From f175f6f03b367465938a0a552623c8c88140e53c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 16 Oct 2024 13:31:07 +0200 Subject: [PATCH] libssh2.sh: cleanups after 1.11.1 bump --- libssh2.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libssh2.sh b/libssh2.sh index fbb3cf4ee..ce46b236f 100755 --- a/libssh2.sh +++ b/libssh2.sh @@ -34,18 +34,11 @@ _VER="$1" if [ "${_OS}" = 'win' ]; then # Silence useless libssh2 warning about missing runtime DLL touch "${_TOP}/${_OPENSSL}/${_PP}/crypto.dll" - if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then - touch "${_TOP}/${_OPENSSL}/${_PP}/ssl.dll" - fi fi elif [ "${_OS}" = 'win' ]; then options+=' -DCRYPTO_BACKEND=WinCNG' fi - if [ "${LIBSSH2_VER_}" != '1.11.0' ]; then - options+=' -DLIBSSH2_NO_DEPRECATED=ON' - fi - if [[ "${_CONFIG}" != *'nounity'* ]]; then options+=' -DCMAKE_UNITY_BUILD=ON' fi @@ -54,15 +47,12 @@ _VER="$1" options+=' -DHIDE_SYMBOLS=OFF' fi - if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then - LIBSSH2_CPPFLAGS+=' -DLIBSSH2_NO_DSA' - fi - if [ "${CW_DEV_INCREMENTAL:-}" != '1' ] || [ ! -d "${_BLDDIR}" ]; then # shellcheck disable=SC2086 cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \ '-DBUILD_SHARED_LIBS=OFF' \ '-DBUILD_EXAMPLES=OFF' \ + '-DLIBSSH2_NO_DEPRECATED=ON' \ '-DBUILD_TESTING=OFF' \ '-DENABLE_DEBUG_LOGGING=OFF' \ "-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${LIBSSH2_CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" # --debug-trycompile