Skip to content

Commit 6d5918e

Browse files
authored
Merge pull request kubernetes-client#231 from ydcpp/conan
conanfile update for lws openssl3 fix
2 parents fbe4574 + 8a69cc4 commit 6d5918e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

kubernetes/conanfile.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ class kubernetes_client_cRecipe(ConanFile):
1111
# Optional metadata
1212
license = "Apache-2.0"
1313
url = "https://github.com/kubernetes-client/c"
14+
homepage = "https://github.com/kubernetes-client/c"
1415
description = "Official C client library for Kubernetes"
1516
topics = ("kubernetes", "k8s", "kubernetes-client", "k8s-client")
1617

1718
# Binary configuration
1819
settings = "os", "compiler", "build_type", "arch"
19-
options = {"shared": [True, False], "fPIC": [True, False], "openssl_shared":[True, False], "curl_version": ["7", "8"]}
20-
default_options = {"shared": False, "fPIC": True, "openssl_shared": True, "curl_version": "8"}
20+
options = {"shared": [True, False], "fPIC": [True, False], "curl_version": ["7", "8"]}
21+
default_options = {"shared": False, "fPIC": True, "curl_version": "8"}
2122

2223
# Sources are located in the same place as this recipe, copy them to the recipe
2324
exports_sources = "config.h.in", "ConfigureChecks.cmake", "PreTarget.cmake", "PostTarget.cmake", "CMakeLists.txt", "src/*", "external/*", "api/*", "model/*", "include/*", "config/*", "watch/*", "websocket/*"
@@ -29,7 +30,7 @@ def config_options(self):
2930
def configure(self):
3031
if self.options.shared:
3132
self.options.rm_safe("fPIC")
32-
self.options["openssl/*"].shared = self.options.openssl_shared
33+
self.options["libwebsockets/*"].with_zlib = "zlib"
3334

3435
def layout(self):
3536
cmake_layout(self)
@@ -61,6 +62,6 @@ def package_info(self):
6162

6263
def requirements(self):
6364
self.requires("libcurl/[~{}]".format(self.options.curl_version), transitive_headers=True)
64-
self.requires("openssl/[^3]", force=True)
65+
self.requires("openssl/[~3]", force=True)
6566
self.requires("libwebsockets/[^4.2]", transitive_headers=True)
6667
self.requires("libyaml/[^0.2.5]")

0 commit comments

Comments
 (0)