Skip to content

Commit 94db3a7

Browse files
committed
ssh2: Disable zlib detection
This seems to only be used with the OpenSSL backend (which we plan to drop). libgit2 already use builtin ZLIB, I'm not even sure we if it would be used in libssh2 (we only use libssh2 to provide git ssh access, and git already compress objects.
1 parent fd85a8e commit 94db3a7

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

tools/git2.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ def build_library(env, deps):
2727
"LIBSSH2_LIBRARY": deps[-1],
2828
"USE_WINHTTP": 0,
2929
"STATIC_CRT": env.get("use_static_cpp", True),
30+
"CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,
31+
"CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,
3032
}
3133

3234
if env["platform"] != "windows":

tools/ssh2.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ def build_library(env, deps):
1212
"BUILD_EXAMPLES": 0,
1313
"BUILD_TESTING": 0,
1414
"BUILD_SHARED_LIBS": 0,
15+
"CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,
16+
"CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,
1517
"CRYPTO_BACKEND": "OpenSSL",
1618
}
1719

0 commit comments

Comments
 (0)