Skip to content

resiprocate: Update libpq requirement to 16.8 and remove legacy code #27220

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 4 additions & 11 deletions recipes/resiprocate/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from conan.tools.gnu import Autotools, AutotoolsToolchain, AutotoolsDeps
from conan.tools.layout import basic_layout

required_conan_version = ">=1.53.0"
required_conan_version = ">=2.1"


class ResiprocateConan(ConanFile):
Expand Down Expand Up @@ -40,16 +40,12 @@ class ResiprocateConan(ConanFile):
"with_mysql": False,
}

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
implements = ["auto_shared_fpic"]

def configure(self):
def validate(self):
if self.settings.os == "Windows" or is_apple_os(self):
# FIXME: unreleased versions of resiprocate use CMake and should support Windows and macOS
raise ConanInvalidConfiguration(f"reSIProcate recipe does not currently support {self.settings.os}.")
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
basic_layout(self, src_folder="src")
Expand All @@ -58,7 +54,7 @@ def requirements(self):
if self.options.with_ssl:
self.requires("openssl/1.1.1w") # OpenSSL 3.x is not supported
if self.options.with_postgresql:
self.requires("libpq/15.4")
self.requires("libpq/[>=16.8 <17]")
if self.options.with_mysql:
self.requires("libmysqlclient/8.1.0")

Expand Down Expand Up @@ -101,6 +97,3 @@ def package_info(self):
if self.settings.os in ("Linux", "FreeBSD"):
self.cpp_info.system_libs = ["pthread"]

# TODO: Legacy, to be removed on Conan 2.0
bin_path = os.path.join(self.package_folder, "bin")
self.env_info.PATH.append(bin_path)
8 changes: 0 additions & 8 deletions recipes/resiprocate/all/test_v1_package/CMakeLists.txt

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/resiprocate/all/test_v1_package/conanfile.py

This file was deleted.