This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/508-remove-deployment-admin-bundle
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/508-remove-deployment-admin-bundle by this push:
new 30efe89b #509: Fix zlib version conflict.
30efe89b is described below
commit 30efe89bade553a30652ae203cc893d414c2a1fb
Author: PengZheng <[email protected]>
AuthorDate: Thu Oct 5 20:18:55 2023 +0800
#509: Fix zlib version conflict.
---
conanfile.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/conanfile.py b/conanfile.py
index 8b3f7e82..e7d3d6ec 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -382,7 +382,6 @@ class CelixConan(ConanFile):
or self.options.build_rsa_discovery_common or
self.options.build_rsa_remote_service_admin_dfi
or self.options.build_launcher):
self.requires("libcurl/[>=7.64.1 <8.0.0]")
- self.requires("zlib/[>=1.2.13 <2.0.0]") #Direct dep on zlib is
needed to resolve a conflict with libcurl and libzip
if (self.options.build_rsa_discovery_common or
self.options.build_shell_bonjour or
(self.options.build_rsa_remote_service_admin_dfi and
self.options.enable_testing)):
self.requires("libxml2/[>=2.9.9 <3.0.0]")
@@ -402,6 +401,8 @@ class CelixConan(ConanFile):
# TODO: To be replaced with mdnsresponder/1790.80.10, resolve some
problems of mdnsresponder
# https://github.com/conan-io/conan-center-index/pull/16254
self.requires("mdnsresponder/1310.140.1")
+ # 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1'
requires 'zlib/1.2.12'
+ self.requires("zlib/1.2.13", override=True)
# the latest civetweb (1.16) is not ready for openssl3
self.requires("openssl/1.1.1t", override=True)
self.validate()
