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

Jump to bottom

build: add checks for openssl configure options #12175

Closed
wants to merge 4 commits into from
Closed

build: add checks for openssl configure options #12175

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9977f4
build: add checks for openssl configure options
danbev Apr 3, 2017
1a20f65
remove semicolon after exit statement
danbev Apr 3, 2017
b44ba5e
rename to without_ssl_error and move into if block
danbev Apr 3, 2017
8d6b9ff
removing leftover empty line
danbev Apr 3, 2017
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
10 changes: 10 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,9 +977,19 @@ def configure_openssl(o):


if options.without_ssl:
if options.shared_openssl:
withoutSSLError('--shared-openssl')
if options.openssl_no_asm:
withoutSSLError('--openssl-no-asm')
if options.openssl_fips:
withoutSSLError('--openssl-fips')
return
configure_library('openssl', o)

def withoutSSLError(option):
print('Error: --without-ssl is incompatible with %s' % option)
exit(1);
Copy link
Member

Choose a reason for hiding this comment

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

Style: without_ssl_error and no semicolon.

You could define it in the if options.without_ssl: block if that's the only place you use it (or simply use or to chain the conditions.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, I've fixed these issues now.



Copy link
Member

Choose a reason for hiding this comment

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

Whitespace change. :-)

def configure_static(o):
if options.fully_static or options.partly_static:
Expand Down