Skip to content
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

(#3476) OpenSSL: change default openssldir value on Linux #4742

Merged
merged 1 commit into from
Mar 7, 2021
Merged

(#3476) OpenSSL: change default openssldir value on Linux #4742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion recipes/openssl/1.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Copy link
Contributor

@SSE4 SSE4 Mar 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about MacOSX, FreeBSD, Android, do they need the same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good question. Since I have a mac I just installed Conan there and tried a small test project with OpenSSL 1.1.1i and I have seen no issue. So I don't think we need to update the default "openssldir" variable there.

For FreeBSD and Android, I don't know.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This certainly fixes Linux, no other platform is affect so I think we can continue with merging

return "/etc/ssl"
return os.path.join(self.package_folder, "res")
rdeterre marked this conversation as resolved.
Show resolved Hide resolved

@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 = [
Expand Down