[libmariadb] update to the 3.1.12 (#17004)

* [libmariadb] update to the 3.1.12

* update version

* Add keyword FEATURES

* update version
This commit is contained in:
JonLiu1993 2021-04-03 03:46:30 +08:00 committed by GitHub
parent 10e85f2cd1
commit db0ec30af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 13 deletions

View File

@ -1,6 +1,5 @@
Source: libmariadb
Version: 3.1.10
Port-Version: 5
Version: 3.1.12
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

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd716e3..7b694e9 100644
index 203fca7..65cc350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,7 +346,8 @@ ENDIF()
@@ -342,7 +342,8 @@ ENDIF()
IF(WITH_ICONV)
IF(NOT WIN32)
@ -12,10 +12,10 @@ index cd716e3..7b694e9 100644
ENDIF()
ENDIF()
@@ -363,8 +364,8 @@ IF(WIN32)
@@ -359,8 +360,8 @@ IF(WIN32)
SET(SYSTEM_LIBS ws2_32 advapi32 kernel32 shlwapi crypt32 ${LIBZ})
ELSE()
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBPTHREAD} ${LIBDL} ${LIBM})
SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBPTHREAD} ${CMAKE_DL_LIBS} ${LIBM})
- IF(ICONV_EXTERNAL)
- SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${ICONV_LIBRARIES})
+ IF(WITH_ICONV)

View File

@ -4,9 +4,9 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MariaDB/mariadb-connector-c
REF 159540fe8c8f30b281748fe8a1b79e8b17993a67 # v3.1.10
SHA512 3e154f5dc4b5051607c7ebc0691a50c0699d60e4414660cf8f65689081ff78ef6b135667761ba8ac4163b469a3b55158c6b48c6fc0a0cc09381452aad157e4ad
REPO mariadb-corporation/mariadb-connector-c
REF 7d304d26c787a3f0430624db977b615aba56e4bb # v3.1.12
SHA512 16e74b2cbe401492ef294e2442a00ef1739089152a88d9263ca4d17b65260554b330630e9405813fd9089fa445d676e3b6aa91ac94128ad6b0a299e8b7edc1b3
HEAD_REF 3.1
PATCHES
arm64.patch
@ -18,8 +18,9 @@ vcpkg_from_github(
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
zlib WITH_EXTERNAL_ZLIB
iconv WITH_ICONV
FEATURES
zlib WITH_EXTERNAL_ZLIB
iconv WITH_ICONV
)
if("openssl" IN_LIST FEATURES)

View File

@ -3217,8 +3217,8 @@
"port-version": 2
},
"libmariadb": {
"baseline": "3.1.10",
"port-version": 5
"baseline": "3.1.12",
"port-version": 0
},
"libmaxminddb": {
"baseline": "1.4.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da",
"version-string": "3.1.12",
"port-version": 0
},
{
"git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0",
"version-string": "3.1.10",