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.

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

Support for LibreSSL #23

Merged
merged 2 commits into from May 27, 2017
Merged

Support for LibreSSL #23

merged 2 commits into from May 27, 2017

Conversation

catatsuy
Copy link
Collaborator

Only libressl does not match option name and software name.

Only libressl does not match option name and software name.

// only libressl does not match option name
if name == "libressl" {
name = "openssl"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Only libressl does not match option name and software name. So I rewritten the option name here.

@@ -23,7 +23,7 @@ func Generate(configure string, modules3rd []module3rd.Module3rd, dependencies [

for _, d := range dependencies {
configure += fmt.Sprintf("%s=../%s-%s \\\n", d.Option, d.Name, d.Version)
if d.Name == "openssl" {
if d.Name == "openssl" || d.Name == "libressl" {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The options required by OpenSSL are also required for LibreSSL.

@@ -188,6 +190,9 @@ func main() {
if *openResty && *tengine {
log.Fatal("select one between '-openresty' and '-tengine'.")
}
if *openSSLStatic && *libreSSLStatic {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Both -openssl and -libressl cannot be enabled at the same time.

@cubicdaiya
Copy link
Owner

LGTM. Could you add documents to README.md?

@catatsuy
Copy link
Collaborator Author

@cubicdaiya Thank you. I add documents for -libressl to README.md. Could you confirm it?

@cubicdaiya cubicdaiya merged commit 102a024 into cubicdaiya:master May 27, 2017
@cubicdaiya
Copy link
Owner

Merged. Thanks.

@catatsuy catatsuy deleted the feature/libressl branch May 28, 2017 02:26
@catatsuy
Copy link
Collaborator Author

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants