[libmariadb] Include bundled zlib and openssl#12669
Merged
strega-nil merged 6 commits intomicrosoft:masterfrom Aug 5, 2020
Merged
[libmariadb] Include bundled zlib and openssl#12669strega-nil merged 6 commits intomicrosoft:masterfrom
strega-nil merged 6 commits intomicrosoft:masterfrom
Conversation
Contributor
|
Please sign CLA first. |
Contributor
Author
|
Signed |
Contributor
|
pbc regression will be fixed in #12732 |
JackBoosY
suggested changes
Aug 4, 2020
JackBoosY
suggested changes
Aug 4, 2020
JackBoosY
suggested changes
Aug 4, 2020
JackBoosY
approved these changes
Aug 4, 2020
hellozee
pushed a commit
to hellozee/vcpkg
that referenced
this pull request
Sep 11, 2020
* [libmariadb] Include bundled zlib and openssl * Update ports/libmariadb/portfile.cmake * Update ports/libmariadb/CONTROL * Update ports/libmariadb/portfile.cmake * Update ports/libmariadb/portfile.cmake * Update ports/libmariadb/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request adds using vcpkg's openssl and zlib with libmariadb.
The first one fixes autolink issues when linking agains python27 or libpng (due to the fact that both inflate functions are autolinked with zlib and libmariadb)
The second change enables libmariadb to use SSL functions.