Merge pull request #290 from Faless/fix/disable_zlib_detection

akien-mga · web-flow · commit b51e8ee42a50 · 2025-05-31T00:58:30.000+02:00
ssh2: Disable zlib detection
diff --git a/tools/git2.py b/tools/git2.py
@@ -27,6 +27,8 @@ def build_library(env, deps):
         "LIBSSH2_LIBRARY": deps[-1],
         "USE_WINHTTP": 0,
         "STATIC_CRT": env.get("use_static_cpp", True),
+        "CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,
+        "CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,
     }
 
     if env["platform"] != "windows":
diff --git a/tools/ssh2.py b/tools/ssh2.py
@@ -12,6 +12,8 @@ def build_library(env, deps):
         "BUILD_EXAMPLES": 0,
         "BUILD_TESTING": 0,
         "BUILD_SHARED_LIBS": 0,
+        "CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,
+        "CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,
         "CRYPTO_BACKEND": "OpenSSL",
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ def build_library(env, deps):`
`27`	`27`	`"LIBSSH2_LIBRARY": deps[-1],`
`28`	`28`	`"USE_WINHTTP": 0,`
`29`	`29`	`"STATIC_CRT": env.get("use_static_cpp", True),`
	`30`	`+ "CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,`
	`31`	`+ "CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`if env["platform"] != "windows":`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ def build_library(env, deps):`
`12`	`12`	`"BUILD_EXAMPLES": 0,`
`13`	`13`	`"BUILD_TESTING": 0,`
`14`	`14`	`"BUILD_SHARED_LIBS": 0,`
	`15`	`+ "CMAKE_DISABLE_FIND_PACKAGE_ZLIB": 1,`
	`16`	`+ "CMAKE_DISABLE_FIND_PACKAGE_OPENSSL": 1,`
`15`	`17`	`"CRYPTO_BACKEND": "OpenSSL",`
`16`	`18`	`}`
`17`	`19`