Skip to content

[libmariadb] Include bundled zlib and openssl #12669

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.

Sign up for GitHub

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
nicole mazzuca (strega-nil) merged 6 commits into from
Aug 5, 2020
Merged

[libmariadb] Include bundled zlib and openssl #12669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59a29d1
[libmariadb] Include bundled zlib and openssl
arves100 Jul 31, 2020
b9caf55
Update ports/libmariadb/portfile.cmake
JackBoosY Aug 4, 2020
6f47e19
Update ports/libmariadb/CONTROL
JackBoosY Aug 4, 2020
411c089
Update ports/libmariadb/portfile.cmake
JackBoosY Aug 4, 2020
e0d81e9
Update ports/libmariadb/portfile.cmake
JackBoosY Aug 4, 2020
cd26ef2
Update ports/libmariadb/portfile.cmake
JackBoosY Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ports/libmariadb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,12 @@ Source: libmariadb
Version: 3.1.7-1
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
Default-Features: zlib, openssl

Feature: zlib
Build-Depends: zlib
Description: Use internal zlib

Feature: openssl
Build-Depends: openssl
Description: Enable SSL support
12 changes: 11 additions & 1 deletion ports/libmariadb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@ vcpkg_from_github(
fix-InstallPath.patch
)

set(WITH_ZLIB OFF)
if("zlib" IN_LIST FEATURES)
set(WITH_ZLIB ON)
endif()
set(WITH_SSL OFF)
if("openssl" IN_LIST FEATURES)
set(WITH_SSL ON)
endif()
Comment thread
JackBoosY marked this conversation as resolved.
Outdated

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
Comment thread
JackBoosY marked this conversation as resolved.
-DWITH_UNITTEST=OFF
-DWITH_SSL=OFF
-DWITH_SSL=${WITH_SSL}
-DWITH_CURL=OFF
-DWITH_EXTERNAL_ZLIB=${WITH_ZLIB}
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
)

vcpkg_install_cmake()
Expand Down