-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[openssl] Finish unified configuration for windows and non-windows #27261
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
e2149af
Simplify non-windows openssl build
dg0yt 4492168
No static libs in dynamic triplet
dg0yt e9550ba
Install /etc/ssl
dg0yt 59f60c7
Refactor common and specific setup
dg0yt d058d19
Fix debug configuration
dg0yt c3c7aed
cleanup
dg0yt 93fdb08
Remove deprecated no-ssl2 option
dg0yt ce3a498
Merge remote-tracking branch 'origin/master' into openssl-unix
dg0yt f731869
Fix absolute path
dg0yt d35bf3b
No legacy target for debug
dg0yt 16683b0
Check for Perl's IPC::Cmd
dg0yt 088fcad
Update linux kernel headers message
dg0yt b5de6e5
CR requests
dg0yt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl | ||
| index 110ba06..5b6b1c7 100644 | ||
| --- a/Configurations/unix-Makefile.tmpl | ||
| +++ b/Configurations/unix-Makefile.tmpl | ||
| @@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime | ||
|
|
||
| uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev | ||
|
|
||
| -install_docs: install_man_docs install_html_docs | ||
| +install_docs: | ||
|
|
||
| uninstall_docs: uninstall_man_docs uninstall_html_docs | ||
| $(RM) -r $(DESTDIR)$(DOCDIR) | ||
| diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl | ||
| index d054431..b5c1c88 100644 | ||
| --- a/Configurations/windows-makefile.tmpl | ||
| +++ b/Configurations/windows-makefile.tmpl | ||
| @@ -487,7 +487,7 @@ install_sw: install_dev install_engines install_modules install_runtime | ||
|
|
||
| uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev | ||
|
|
||
| -install_docs: install_html_docs | ||
| +install_docs: | ||
|
|
||
| uninstall_docs: uninstall_html_docs | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/tools/c_rehash.in b/tools/c_rehash.in | ||
| index 343cdc1..e48038e 100644 | ||
| --- a/tools/c_rehash.in | ||
| +++ b/tools/c_rehash.in | ||
| @@ -12,7 +12,7 @@ | ||
| # and add symbolic links to their hash values. | ||
|
|
||
| my $dir = {- quotify1($config{openssldir}) -}; | ||
| -my $prefix = {- quotify1($config{prefix}) -}; | ||
| +use FindBin; | ||
|
|
||
| my $errorcount = 0; | ||
| my $openssl = $ENV{OPENSSL} || "openssl"; | ||
| @@ -61,7 +61,7 @@ if (defined(&Cwd::getcwd)) { | ||
|
|
||
| # DOS/Win32 or Unix delimiter? Prefix our installdir, then search. | ||
| my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; | ||
| -$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); | ||
| +$ENV{PATH} = "$FindBin::Bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); | ||
|
|
||
| if (! -x $openssl) { | ||
| my $found = 0; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you're still using VERSION; should this be kept?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. The check is obsolete since the check in
scripts/ports.cmakewas updated.