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
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 all commits
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
12 changes: 11 additions & 1 deletion ports/libmariadb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
Source: libmariadb
Version: 3.1.7-1
Version: 3.1.7
Port-Version: 2
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
9 changes: 7 additions & 2 deletions ports/libmariadb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MariaDB/mariadb-connector-c
REF 8e9c3116105d9a998a60991b7f4ba910d454d4b1 # v3.1.7
REF 8e9c3116105d9a998a60991b7f4ba910d454d4b1 # v3.1.7
SHA512 b663effe7794d997c0589a9a20dab6b7359414612e60e3cb43e3fd0ddeae0391bcbc2d816cba4a7438602566ad6781cbf8e18b0062f1d37a2b2bd521af16033c
HEAD_REF master
PATCHES
Expand All @@ -17,12 +17,17 @@ vcpkg_from_github(
fix-InstallPath.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zlib WITH_EXTERNAL_ZLIB
openssl WITH_SSL
)

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

Expand Down