From a14b82484e79699a0382105014122287691ad56c Mon Sep 17 00:00:00 2001 From: Romain Deterre Date: Mon, 1 Mar 2021 09:08:09 -0500 Subject: [PATCH] (#3476) OpenSSL: change default openssldir value on Linux --- recipes/openssl/1.x.x/conanfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index 25c24700125e6..af45c8189d595 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -436,9 +436,14 @@ def _get_env_build(self): self._env_build = AutoToolsBuildEnvironment(self) return self._env_build + def _get_default_openssl_dir(self): + if self.settings.os == "Linux" and self._full_version >= "1.1.0": + return "/etc/ssl" + return os.path.join(self.package_folder, "res") + @property def _configure_args(self): - openssldir = self.options.openssldir if self.options.openssldir else os.path.join(self.package_folder, "res") + openssldir = self.options.openssldir or self._get_default_openssl_dir() prefix = tools.unix_path(self.package_folder) if self._win_bash else self.package_folder openssldir = tools.unix_path(openssldir) if self._win_bash else openssldir args = [