Skip to content

Commit f175f6f

Browse files
committed
libssh2.sh: cleanups after 1.11.1 bump
1 parent 9b3b457 commit f175f6f

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

libssh2.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,11 @@ _VER="$1"
3434
if [ "${_OS}" = 'win' ]; then
3535
# Silence useless libssh2 warning about missing runtime DLL
3636
touch "${_TOP}/${_OPENSSL}/${_PP}/crypto.dll"
37-
if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then
38-
touch "${_TOP}/${_OPENSSL}/${_PP}/ssl.dll"
39-
fi
4037
fi
4138
elif [ "${_OS}" = 'win' ]; then
4239
options+=' -DCRYPTO_BACKEND=WinCNG'
4340
fi
4441

45-
if [ "${LIBSSH2_VER_}" != '1.11.0' ]; then
46-
options+=' -DLIBSSH2_NO_DEPRECATED=ON'
47-
fi
48-
4942
if [[ "${_CONFIG}" != *'nounity'* ]]; then
5043
options+=' -DCMAKE_UNITY_BUILD=ON'
5144
fi
@@ -54,15 +47,12 @@ _VER="$1"
5447
options+=' -DHIDE_SYMBOLS=OFF'
5548
fi
5649

57-
if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then
58-
LIBSSH2_CPPFLAGS+=' -DLIBSSH2_NO_DSA'
59-
fi
60-
6150
if [ "${CW_DEV_INCREMENTAL:-}" != '1' ] || [ ! -d "${_BLDDIR}" ]; then
6251
# shellcheck disable=SC2086
6352
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
6453
'-DBUILD_SHARED_LIBS=OFF' \
6554
'-DBUILD_EXAMPLES=OFF' \
55+
'-DLIBSSH2_NO_DEPRECATED=ON' \
6656
'-DBUILD_TESTING=OFF' \
6757
'-DENABLE_DEBUG_LOGGING=OFF' \
6858
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${LIBSSH2_CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" # --debug-trycompile

0 commit comments

Comments
 (0)