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

[libmariadb] Include bundled zlib and openssl #12669

Merged
merged 6 commits into from
Aug 5, 2020

Conversation

arves100
Copy link
Contributor

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.

@ghost
Copy link

ghost commented Jul 31, 2020

CLA assistant check
All CLA requirements met.

@JackBoosY
Copy link
Contributor

Please sign CLA first.

@JackBoosY JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist requires:author-response labels Aug 3, 2020
@arves100
Copy link
Contributor Author

arves100 commented Aug 3, 2020

Signed

@JackBoosY
Copy link
Contributor

pbc regression will be fixed in #12732

ports/libmariadb/portfile.cmake Outdated Show resolved Hide resolved
ports/libmariadb/CONTROL Outdated Show resolved Hide resolved
ports/libmariadb/portfile.cmake Outdated Show resolved Hide resolved
ports/libmariadb/portfile.cmake Show resolved Hide resolved
ports/libmariadb/portfile.cmake Outdated Show resolved Hide resolved
@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 5, 2020
@strega-nil strega-nil merged commit a5d2338 into microsoft:master Aug 5, 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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants