This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/libuuid-switch in repository https://gitbox.apache.org/repos/asf/celix.git
commit a7581acb60df8bbcd23fd4a6819a006e941d99a8 Author: PengZheng <howto...@gmail.com> AuthorDate: Wed Aug 9 19:17:14 2023 +0800 Switch to util-linux-libuuid to avoid conflict with other conan package. --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index aa8444ee..e863acae 100644 --- a/conanfile.py +++ b/conanfile.py @@ -381,8 +381,8 @@ class CelixConan(ConanFile): self.requires("libzip/[>=1.7.3 <2.0.0]") self.options['libzip'].shared = True if self.options.build_framework or self.options.build_pubsub: - self.requires("libuuid/1.0.3") - self.options['libuuid'].shared = True + self.requires("util-linux-libuuid/2.39") + self.options['util-linux-libuuid'].shared = True if self.options.build_framework or self.options.build_celix_etcdlib: self.requires("libcurl/[>=7.64.1 <8.0.0]") self.options['libcurl'].shared = True