mirror of https://github.com/microsoft/vcpkg.git
[libmysql] upgade up to 8.0.46 (#52001)
Co-authored-by: aleksandr-smyslov <aleksandr.smyslov@libertexgroup.com> Co-authored-by: Kai Pastor <dg0yt@darc.de>
This commit is contained in:
parent
27e2035aa8
commit
e40cf469e3
|
|
@ -2,14 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||
index e17ec1d0..465e42f0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -818,8 +818,12 @@ INCLUDE(fileutils)
|
||||
@@ -818,9 +818,13 @@ INCLUDE(fileutils)
|
||||
INCLUDE(zlib)
|
||||
INCLUDE(zstd)
|
||||
INCLUDE(lz4)
|
||||
-INCLUDE(icu)
|
||||
-INCLUDE(libevent)
|
||||
+macro(MYSQL_CHECK_ICU)
|
||||
+endmacro()
|
||||
INCLUDE(libbacktrace)
|
||||
-INCLUDE(libevent)
|
||||
+macro(MYSQL_CHECK_LIBEVENT)
|
||||
+endmacro()
|
||||
+macro(WARN_MISSING_SYSTEM_LIBEVENT)
|
||||
|
|
@ -17,7 +18,7 @@ index e17ec1d0..465e42f0 100644
|
|||
INCLUDE(ssl)
|
||||
INCLUDE(sasl)
|
||||
INCLUDE(ldap)
|
||||
@@ -837,7 +841,8 @@ INCLUDE(curl)
|
||||
@@ -837,7 +840,8 @@ INCLUDE(curl)
|
||||
INCLUDE(rapidjson)
|
||||
INCLUDE(fprofile)
|
||||
INCLUDE(gloves)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO mysql/mysql-server
|
||||
REF "mysql-${VERSION}"
|
||||
SHA512 f0591d263de557877a618b04871d332dc227e26c7e9b61994093dc9af29971ea6332761de5391bb8da955bd58b3b98da90722bafdbf86f36764995a70f94ae62
|
||||
SHA512 68e42702c3f99eb92f695d4d26cfbd7b07c0b8cfaa07f23d8aad5d7271fadf8d619679fcde821296c6dbc6b14b0c5637b31b5ec91eb414cfc5e19339bfdf6e07
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
dependencies.patch
|
||||
|
|
@ -17,7 +17,11 @@ vcpkg_from_github(
|
|||
)
|
||||
|
||||
file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_*")
|
||||
list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit")
|
||||
list(REMOVE_ITEM third_party
|
||||
"${SOURCE_PATH}/extra/libedit"
|
||||
"${SOURCE_PATH}/extra/unordered_dense"
|
||||
"${SOURCE_PATH}/extra/xxhash"
|
||||
)
|
||||
if (third_party)
|
||||
file(REMOVE_RECURSE ${third_party})
|
||||
endif()
|
||||
|
|
@ -87,6 +91,7 @@ vcpkg_cmake_configure(
|
|||
-DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER}
|
||||
-DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS}
|
||||
-DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE}
|
||||
-DWITH_EXT_BACKTRACE=OFF
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
BUNDLE_RUNTIME_LIBRARIES # only on windows
|
||||
LINK_STATIC_RUNTIME_LIBRARIES # only on windows
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "libmysql",
|
||||
"version": "8.0.40",
|
||||
"port-version": 1,
|
||||
"version": "8.0.46",
|
||||
"description": "A MySQL client library for C development",
|
||||
"homepage": "https://github.com/mysql/mysql-server",
|
||||
"license": "GPL-2.0-or-later",
|
||||
|
|
|
|||
|
|
@ -5349,8 +5349,8 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"libmysql": {
|
||||
"baseline": "8.0.40",
|
||||
"port-version": 1
|
||||
"baseline": "8.0.46",
|
||||
"port-version": 0
|
||||
},
|
||||
"libnice": {
|
||||
"baseline": "0.1.22",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a22dc2cf3599605c2366d60ccc8d3571fa814ea1",
|
||||
"version": "8.0.46",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "ceb14e4e1b3226c3fccc6dd2ceb27d5b04124af6",
|
||||
"version": "8.0.40",
|
||||
|
|
|
|||
Loading…
Reference in New Issue