Skip to content

Fix openssl include path directory #271

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

Merged
walac merged 1 commit into from
Jul 7, 2020
Merged

Fix openssl include path directory #271

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
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ elif (get_option('crypto') == 'gnutls')
elif (get_option('crypto') == 'openssl')
if (get_option('openssl_dir') != '')
crypto = declare_dependency(
link_args: ['-L' + get_option('openssl_dir'), '-llibssl_static', '-llibcrypto_static'],
link_args: ['-L' + get_option('openssl_dir'), '-L' + get_option('openssl_dir') + '/lib', '-llibssl_static', '-llibcrypto_static'],
Copy link
Contributor

@JPTIZ JPTIZ Jul 7, 2020

Choose a reason for hiding this comment

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

I think it should be get_option('openssl_dir') / 'lib', but...

Copy link
Contributor Author

@walac walac Jul 9, 2020

Choose a reason for hiding this comment

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

It feels like the CI has a version of meson that doesn't support the syntax.

Copy link
Contributor

@JPTIZ JPTIZ Jul 9, 2020

Choose a reason for hiding this comment

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

Windows CI version is always the updated from PyPI (0.54.3), so it should support. Didn't check Travis, tho

compile_args: ['-I' + get_option('openssl_dir') + '/include'],
)
else
Expand Down