From bb136dd7b666f36e65c27c0ae9f17d55eacdf28c Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Sat, 2 Sep 2023 18:38:35 +0200 Subject: [PATCH] use new libuuid recipe --- recipes/fontconfig/all/conanfile.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/fontconfig/all/conanfile.py b/recipes/fontconfig/all/conanfile.py index 2eaab270f5f4d5..d003de24615775 100644 --- a/recipes/fontconfig/all/conanfile.py +++ b/recipes/fontconfig/all/conanfile.py @@ -23,12 +23,10 @@ class FontconfigConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], - "libuuid": ["libuuid", "util-linux"] } default_options = { "shared": False, "fPIC": True, - "libuuid": "libuuid", } @property @@ -52,10 +50,7 @@ def requirements(self): self.requires("freetype/2.13.0") self.requires("expat/2.5.0") if self.settings.os == "Linux": - if self.options.libuuid == "libuuid": - self.requires("libuuid/1.0.3") - else: - self.requires("util-linux-libuuid/2.39") + self.requires("util-linux-libuuid/2.39") def validate(self): if is_msvc(self): @@ -64,7 +59,7 @@ def validate(self): def build_requirements(self): self.tool_requires("gperf/3.1") if not self.conf.get("tools.gnu:pkg_config", check_type=str): - self.tool_requires("pkgconf/1.9.3") + self.tool_requires("pkgconf/2.0.2") if self._settings_build.os == "Windows": self.win_bash = True if not self.conf.get("tools.microsoft.bash:path", check_type=str):