From e2606d2a3762fad7878648ace74ae86674ce30d8 Mon Sep 17 00:00:00 2001 From: czoido Date: Wed, 17 Aug 2022 14:31:14 +0200 Subject: [PATCH 1/6] fix evil insertion --- recipes/openssl/1.x.x/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index eb10a589c8c69..52c009e8344b9 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -539,8 +539,8 @@ def _configure_args(self): # clang-cl doesn't like backslashes in #define CFLAGS (builldinf.h -> cversion.c) include_path = self._adjust_path(include_path) lib_path = self._adjust_path(lib_path) - - if zlib_info.shared: + + if self.options["zlib"].shared: args.append("zlib-dynamic") else: args.append("zlib") From 3afc5217d8c15aedb4a3fa86876be66b87aa8f40 Mon Sep 17 00:00:00 2001 From: czoido Date: Wed, 17 Aug 2022 14:32:16 +0200 Subject: [PATCH 2/6] fix format --- recipes/openssl/1.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index 52c009e8344b9..911c9a099f8e8 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -539,7 +539,7 @@ def _configure_args(self): # clang-cl doesn't like backslashes in #define CFLAGS (builldinf.h -> cversion.c) include_path = self._adjust_path(include_path) lib_path = self._adjust_path(lib_path) - + if self.options["zlib"].shared: args.append("zlib-dynamic") else: From 9fcb448616c454ac8e96e7e8c892e4cce7aa4c5c Mon Sep 17 00:00:00 2001 From: czoido Date: Wed, 17 Aug 2022 15:21:09 +0200 Subject: [PATCH 3/6] fix linter --- recipes/openssl/1.x.x/conanfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index 911c9a099f8e8..ab83864cdb2cd 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -1,5 +1,6 @@ -from conan.tools.files import rename +from conan.tools.files import rename, get, rmdir from conan.tools.microsoft import is_msvc, msvc_runtime_flag +from conan.tools.build import cross_building from conans.errors import ConanInvalidConfiguration from conans import ConanFile, AutoToolsBuildEnvironment, tools from contextlib import contextmanager @@ -171,7 +172,7 @@ def _full_version(self): def _win_bash(self): return self._settings_build.os == "Windows" and \ not self._use_nmake and \ - (self._is_mingw or tools.cross_building(self, skip_x64_x86=True)) + (self._is_mingw or cross_building(self, skip_x64_x86=True)) def export_sources(self): for patch in self.conan_data.get("patches", {}).get(self.version, []): @@ -244,8 +245,8 @@ def build_requirements(self): self.build_requires("msys2/cci.latest") def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + get(self, **self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) @property def _target_prefix(self): @@ -813,7 +814,7 @@ def package(self): if file.endswith(".a"): os.unlink(os.path.join(libdir, file)) - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) self._create_cmake_module_variables( os.path.join(self.package_folder, self._module_file_rel_path) From 22ecfb8ea2b3005747dc261bc34ca55674cad62a Mon Sep 17 00:00:00 2001 From: czoido Date: Wed, 17 Aug 2022 17:02:52 +0200 Subject: [PATCH 4/6] fix linter --- recipes/openssl/1.x.x/test_package/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/openssl/1.x.x/test_package/conanfile.py b/recipes/openssl/1.x.x/test_package/conanfile.py index df670e2f86884..dc8b525e65b49 100644 --- a/recipes/openssl/1.x.x/test_package/conanfile.py +++ b/recipes/openssl/1.x.x/test_package/conanfile.py @@ -1,4 +1,5 @@ from conans import CMake, tools, ConanFile +from conan.tools.build import cross_building import os @@ -32,7 +33,7 @@ def build(self): cmake.build() def test(self): - if not self._skip_test and not tools.cross_building(self): + if not self._skip_test and not cross_building(self): bin_path = os.path.join("bin", "digest") self.run(bin_path, run_environment=True) assert os.path.exists(os.path.join(self.deps_cpp_info["openssl"].rootpath, "licenses", "LICENSE")) From 235b9980f7a7b525a1d631a6e8049c83552c947b Mon Sep 17 00:00:00 2001 From: czoido Date: Wed, 17 Aug 2022 17:43:06 +0200 Subject: [PATCH 5/6] fix linter --- recipes/openssl/1.x.x/test_package/conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/openssl/1.x.x/test_package/conanfile.py b/recipes/openssl/1.x.x/test_package/conanfile.py index dc8b525e65b49..cb46a8b111c15 100644 --- a/recipes/openssl/1.x.x/test_package/conanfile.py +++ b/recipes/openssl/1.x.x/test_package/conanfile.py @@ -1,4 +1,5 @@ -from conans import CMake, tools, ConanFile +from conans import CMake, ConanFile +from conan.tools.scm import Version from conan.tools.build import cross_building import os @@ -24,7 +25,7 @@ def build(self): cmake = CMake(self) if self.settings.os == "Android": cmake.definitions["CONAN_LIBCXX"] = "" - openssl_version = tools.Version(self.deps_cpp_info["openssl"].version) + openssl_version = Version(self.deps_cpp_info["openssl"].version) if openssl_version.major == "1" and openssl_version.minor == "1": cmake.definitions["OPENSSL_WITH_ZLIB"] = False else: From 4dd573875c9a0ffedc67a0e808a5c08024d182f1 Mon Sep 17 00:00:00 2001 From: czoido Date: Thu, 18 Aug 2022 10:49:05 +0200 Subject: [PATCH 6/6] ConanInvalidConfiguration --- recipes/openssl/1.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index ab83864cdb2cd..4002bcc2c4641 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -1,7 +1,7 @@ from conan.tools.files import rename, get, rmdir from conan.tools.microsoft import is_msvc, msvc_runtime_flag from conan.tools.build import cross_building -from conans.errors import ConanInvalidConfiguration +from conan.errors import ConanInvalidConfiguration from conans import ConanFile, AutoToolsBuildEnvironment, tools from contextlib import contextmanager from functools import total_ordering