diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-04-03 03:46:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 12:46:30 -0700 |
| commit | db0ec30af6eb8d548a324ec7ab31b8467d85464e (patch) | |
| tree | 4d20f8ae3a5e2018ff2f548ac6ccf36c4c71a7d1 | |
| parent | 10e85f2cd126e22f6ee23c0ffe4e4f150ddf05a1 (diff) | |
| download | vcpkg-db0ec30af6eb8d548a324ec7ab31b8467d85464e.tar.gz vcpkg-db0ec30af6eb8d548a324ec7ab31b8467d85464e.zip | |
[libmariadb] update to the 3.1.12 (#17004)
* [libmariadb] update to the 3.1.12
* update version
* Add keyword FEATURES
* update version
| -rw-r--r-- | ports/libmariadb/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libmariadb/fix-iconv.patch | 8 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/l-/libmariadb.json | 5 |
5 files changed, 18 insertions, 13 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 413a2e9af..949f66ce2 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -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
diff --git a/ports/libmariadb/fix-iconv.patch b/ports/libmariadb/fix-iconv.patch index dd34fc2cf..a3b428421 100644 --- a/ports/libmariadb/fix-iconv.patch +++ b/ports/libmariadb/fix-iconv.patch @@ -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) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index cf538deaa..e2d37d640 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -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)
diff --git a/versions/baseline.json b/versions/baseline.json index 66a357e15..4213607c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index 294844bea..87f111a2c 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da", + "version-string": "3.1.12", + "port-version": 0 + }, + { "git-tree": "674b0c8bcc3ee3276a0bce8afd72b99c5013f4a0", "version-string": "3.1.10", "port-version": 5 |