From 59a29d155409f614111ed7ef169f1d55e68f1614 Mon Sep 17 00:00:00 2001 From: Arves100 Date: Fri, 31 Jul 2020 15:43:47 +0200 Subject: [PATCH 1/6] [libmariadb] Include bundled zlib and openssl --- ports/libmariadb/CONTROL | 9 +++++++++ ports/libmariadb/portfile.cmake | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 6507c55c71c49e..55fefba65366b9 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -2,3 +2,12 @@ Source: libmariadb Version: 3.1.7-1 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 06f54bb41d55e3..3f97e9edb1eb5f 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -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() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DWITH_UNITTEST=OFF - -DWITH_SSL=OFF + -DWITH_SSL=${WITH_SSL} -DWITH_CURL=OFF + -DWITH_EXTERNAL_ZLIB=${WITH_ZLIB} ) vcpkg_install_cmake() From b9caf550e07fe4370ed16d5cd9857526acea95c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:14:34 -0700 Subject: [PATCH 2/6] Update ports/libmariadb/portfile.cmake --- ports/libmariadb/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 3f97e9edb1eb5f..84f270833d86e5 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 @@ -33,7 +33,7 @@ vcpkg_configure_cmake( -DWITH_UNITTEST=OFF -DWITH_SSL=${WITH_SSL} -DWITH_CURL=OFF - -DWITH_EXTERNAL_ZLIB=${WITH_ZLIB} + -DWITH_EXTERNAL_ZLIB=${WITH_ZLIB} ) vcpkg_install_cmake() From 6f47e190d80abbd07e206340639ba87e3e6c94c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:15:01 -0700 Subject: [PATCH 3/6] Update ports/libmariadb/CONTROL --- ports/libmariadb/CONTROL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 55fefba65366b9..d3b39d0afc406a 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,5 +1,6 @@ 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 From 411c089ce6b768b4ca11f003436475e3b973b1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:17:47 -0700 Subject: [PATCH 4/6] Update ports/libmariadb/portfile.cmake --- ports/libmariadb/portfile.cmake | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 84f270833d86e5..cadf1f8e38d912 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -17,14 +17,10 @@ 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() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + zlib WITH_EXTERNAL_ZLIB + openssl WITH_SSL +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From e0d81e9cae00cb2e4694a3c60b6e3d2ffef8843e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:17:54 -0700 Subject: [PATCH 5/6] Update ports/libmariadb/portfile.cmake --- ports/libmariadb/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index cadf1f8e38d912..f7bda647a035ae 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DWITH_UNITTEST=OFF -DWITH_SSL=${WITH_SSL} -DWITH_CURL=OFF From cd26ef22a9cd02d7539ae9f6e8da3e7a513eb4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 4 Aug 2020 02:18:01 -0700 Subject: [PATCH 6/6] Update ports/libmariadb/portfile.cmake --- ports/libmariadb/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index f7bda647a035ae..6943c934c0bb88 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -28,9 +28,7 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} -DWITH_UNITTEST=OFF - -DWITH_SSL=${WITH_SSL} -DWITH_CURL=OFF - -DWITH_EXTERNAL_ZLIB=${WITH_ZLIB} ) vcpkg_install_cmake()