Skip to content

Commit

Permalink
libssh2.sh: cleanups after 1.11.1 bump
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 16, 2024
1 parent 9b3b457 commit f175f6f
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions libssh2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f175f6f

Please sign in to comment.