Skip to content

Commit

Permalink
glib: Bump libmount to 2.39.2 to avoid conflicts with libsystemd (con…
Browse files Browse the repository at this point in the history
…an-io#23030)

Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com>
Co-authored-by: Abril Rincón Blanco <git@rinconblanco.es>
Co-authored-by: Abril Rincón Blanco <rubenrb@jfrog.com>
  • Loading branch information
4 people authored Nov 28, 2024
1 parent 39e44b9 commit 99954a6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 30 deletions.
6 changes: 3 additions & 3 deletions recipes/glib/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import shutil


required_conan_version = ">=1.53.0"
required_conan_version = ">=2.0"


class GLibConan(ConanFile):
Expand Down Expand Up @@ -73,7 +73,7 @@ def requirements(self):
if self.options.get_safe("with_elf"):
self.requires("libelf/0.8.13")
if self.options.get_safe("with_mount"):
self.requires("libmount/2.39")
self.requires("libmount/2.39.2")
if self.options.get_safe("with_selinux"):
self.requires("libselinux/3.6")
if self.settings.os != "Linux":
Expand All @@ -86,7 +86,7 @@ def requirements(self):
def build_requirements(self):
self.tool_requires("meson/[>=1.2.3 <2]")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/[>=2.2 <3]")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
8 changes: 0 additions & 8 deletions recipes/glib/all/test_v1_package/CMakeLists.txt

This file was deleted.

19 changes: 0 additions & 19 deletions recipes/glib/all/test_v1_package/conanfile.py

This file was deleted.

0 comments on commit 99954a6

Please sign in to comment.