Skip to content

[libmariadb] Include bundled zlib and openssl#12669

Merged
strega-nil merged 6 commits intomicrosoft:masterfrom
arves100:mariadb-2
Aug 5, 2020
Merged

[libmariadb] Include bundled zlib and openssl#12669
strega-nil merged 6 commits intomicrosoft:masterfrom
arves100:mariadb-2

Conversation

@arves100
Copy link
Copy Markdown
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
Copy Markdown

ghost commented Jul 31, 2020

CLA assistant check
All CLA requirements met.

@JackBoosY
Copy link
Copy Markdown
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
Copy Markdown
Contributor Author

arves100 commented Aug 3, 2020

Signed

@JackBoosY
Copy link
Copy Markdown
Contributor

pbc regression will be fixed in #12732

Comment thread ports/libmariadb/portfile.cmake Outdated
Comment thread ports/libmariadb/CONTROL Outdated
Comment thread ports/libmariadb/portfile.cmake Outdated
Comment thread ports/libmariadb/portfile.cmake
Comment thread ports/libmariadb/portfile.cmake Outdated
@JackBoosY JackBoosY added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. 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 <47264268+JackBoosY@users.noreply.github.com>
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:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants