diff options
| author | Arves100 <arves100@gmail.com> | 2020-08-05 21:03:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 14:03:22 -0700 |
| commit | a5d23385e57bbb35a22dadcf40fc1801fb968aed (patch) | |
| tree | f7ed5b8f684204b73ed6df2d49a88e0293b9841b | |
| parent | 11f15f3ab8eddff06066b662e36ec23c8e434859 (diff) | |
| download | vcpkg-a5d23385e57bbb35a22dadcf40fc1801fb968aed.tar.gz vcpkg-a5d23385e57bbb35a22dadcf40fc1801fb968aed.zip | |
[libmariadb] Include bundled zlib and openssl (#12669)
* [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>
| -rw-r--r-- | ports/libmariadb/CONTROL | 12 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 9 |
2 files changed, 18 insertions, 3 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 6507c55c7..d3b39d0af 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -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
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 06f54bb41..6943c934c 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -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
@@ -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
+ ${FEATURE_OPTIONS}
-DWITH_UNITTEST=OFF
- -DWITH_SSL=OFF
-DWITH_CURL=OFF
)
|