From 1b138e398fc7276592bd27273364556c211042f6 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:45:29 +0200 Subject: [PATCH 1/2] bump dependencies and use version range for openssl --- recipes/apr-util/all/conanfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/apr-util/all/conanfile.py b/recipes/apr-util/all/conanfile.py index 86dd0a9fc160c..be8e2f61785f9 100644 --- a/recipes/apr-util/all/conanfile.py +++ b/recipes/apr-util/all/conanfile.py @@ -76,7 +76,7 @@ def layout(self): basic_layout(self, src_folder="src") def requirements(self): - self.requires("apr/1.7.0", transitive_headers=True) + self.requires("apr/1.7.4", transitive_headers=True) if self.settings.os != "Windows": #cmake build doesn't allow injection of iconv yet # https://github.com/conan-io/conan-center-index/pull/16142#issuecomment-1494282164 @@ -84,15 +84,15 @@ def requirements(self): # are pulling it in - discovered in https://github.com/conan-io/conan-center-index/pull/16266 self.requires("libiconv/1.17", transitive_libs=True) if self.options.with_openssl: - self.requires("openssl/1.1.1t") + self.requires("openssl/[>=1.1 <4]") if self.options.with_mysql: - self.requires("libmysqlclient/8.0.31") + self.requires("libmysqlclient/8.1.0") if self.options.with_sqlite3: - self.requires("sqlite3/3.41.1") + self.requires("sqlite3/3.43.1") if self.options.with_expat: self.requires("expat/2.5.0") if self.options.with_postgresql: - self.requires("libpq/14.5") + self.requires("libpq/15.4") def validate(self): if not self.options.with_expat: From 98b17d08c3e9c78b189df76ac28c459aaae0d6d5 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:40:28 +0200 Subject: [PATCH 2/2] fix libdirs in APRUTIL_LDFLAGS env var --- recipes/apr-util/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/apr-util/all/conanfile.py b/recipes/apr-util/all/conanfile.py index be8e2f61785f9..cdc91defc9dca 100644 --- a/recipes/apr-util/all/conanfile.py +++ b/recipes/apr-util/all/conanfile.py @@ -210,7 +210,7 @@ def package_info(self): self.runenv_info.define_path("APR_UTIL_ROOT", self.package_folder) deps = [dep for dep in reversed(self.dependencies.host.topological_sort.values())] - libdirs = [p for dep in deps for p in dep.cpp_info.aggregated_components().includedirs] + libdirs = [p for dep in deps for p in dep.cpp_info.aggregated_components().libdirs] aprutil_ldflags = " ".join([f"-L{p}" for p in libdirs]) self.runenv_info.define("APRUTIL_LDFLAGS", aprutil_ldflags)