Skip to content

Commit

Permalink
#509: Fix zlib version conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
PengZheng committed Oct 5, 2023
1 parent f2083df commit 30efe89
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ def requirements(self):
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]")
Expand All @@ -402,6 +401,8 @@ def requirements(self):
# 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()
Expand Down

0 comments on commit 30efe89

Please sign in to comment.