From 82fbd4c1e638a94b211bf7f7675ed36cd26892f5 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Tue, 21 May 2024 12:23:23 -0500 Subject: [PATCH] glib: Depend on elfutils instead of libelf where possible The libelf library is antiquated. The elfutils package is actively maintained and provides its own libelf implementation, which is the standard implementation on Linux. Since elfutils can not be used everywhere, only use it for supported configurations. Also, bump gettext to version 0.22.5 to support GCC 14. --- recipes/glib/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/glib/all/conanfile.py b/recipes/glib/all/conanfile.py index 6ccdcc81fb42ae..2369fb9a8ac461 100644 --- a/recipes/glib/all/conanfile.py +++ b/recipes/glib/all/conanfile.py @@ -68,7 +68,10 @@ def requirements(self): self.requires("libffi/3.4.4") self.requires("pcre2/10.42") if self.options.get_safe("with_elf"): - self.requires("libelf/0.8.13") + if is_apple_os(self) or self.settings.compiler not in ["clang", "gcc"]: + self.requires("libelf/0.8.13") + else: + self.requires("elfutils/0.190") if self.options.get_safe("with_mount"): self.requires("libmount/2.39") if self.options.get_safe("with_selinux"):