Skip to content

apr-util: bump dependencies and use version range for openssl #19938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
conan-center-bot merged 3 commits into from
Oct 4, 2023
Merged

apr-util: bump dependencies and use version range for openssl #19938

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b138e3
bump dependencies and use version range for openssl
SpaceIm Sep 18, 2023
98b17d0
fix libdirs in APRUTIL_LDFLAGS env var
SpaceIm Sep 30, 2023
062ddd3
Merge branch 'master' into apr-util-bump-deps
SpaceIm Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions recipes/apr-util/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ 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
# transitive_libs needs to be set because some sys-frameworks on the old mac images for c3i
# 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:
Expand Down Expand Up @@ -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)

Expand Down