From ba9213a697e36e00d5ce8d2a4adf2e62891047d0 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Fri, 3 Nov 2023 13:54:14 +0200 Subject: [PATCH] libest: fic OpenSSL dependency configuration --- recipes/libest/all/conanfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/libest/all/conanfile.py b/recipes/libest/all/conanfile.py index 225003c29ce79f..d7002e21e97478 100644 --- a/recipes/libest/all/conanfile.py +++ b/recipes/libest/all/conanfile.py @@ -4,8 +4,9 @@ from conan.errors import ConanInvalidConfiguration from conan.tools.apple import is_apple_os from conan.tools.files import apply_conandata_patches, chdir, copy, export_conandata_patches, get, replace_in_file -from conan.tools.gnu import Autotools, AutotoolsToolchain, PkgConfigDeps, AutotoolsDeps +from conan.tools.gnu import Autotools, AutotoolsToolchain from conan.tools.layout import basic_layout +from conan.tools.microsoft import unix_path required_conan_version = ">=1.53.0" @@ -58,10 +59,9 @@ def source(self): def generate(self): tc = AutotoolsToolchain(self) - tc.generate() - tc = AutotoolsDeps(self) - tc.generate() - tc = PkgConfigDeps(self) + openssl_info = self.dependencies["openssl"].cpp_info + tc.make_args.append("SSL_CFLAGS=" + " ".join([f"-I{unix_path(self, p)}" for p in openssl_info.includedirs] + [f"-D{d}" for d in openssl_info.defines])) + tc.make_args.append("SSL_LDFLAGS=" + " ".join([f"-L{unix_path(self, p)}" for p in openssl_info.libdirs] + openssl_info.sharedlinkflags + openssl_info.exelinkflags)) tc.generate() def _patch_sources(self):