Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/c/compat.libmysqlclient.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@ package = {
url = "https://github.com/wellwei/libmysqlclient/archive/refs/tags/8.4.6.tar.gz",
sha256 = "27decd6716591d84a6f765a3d63fcd24031373841c684369445b83a840b38bea",
},
["8.4.6.1"] = {
url = "https://github.com/wellwei/libmysqlclient/archive/refs/tags/8.4.6.1.tar.gz",
sha256 = "e50e5da37baa26fff56952d85bd8e33b577be7a534e67df0b8e10a5cc8507af8",
},
},
macosx = {
["8.4.6"] = {
url = "https://github.com/wellwei/libmysqlclient/archive/refs/tags/8.4.6.tar.gz",
sha256 = "27decd6716591d84a6f765a3d63fcd24031373841c684369445b83a840b38bea",
},
["8.4.6.1"] = {
url = "https://github.com/wellwei/libmysqlclient/archive/refs/tags/8.4.6.1.tar.gz",
sha256 = "e50e5da37baa26fff56952d85bd8e33b577be7a534e67df0b8e10a5cc8507af8",
},
},
},

Expand Down
10 changes: 5 additions & 5 deletions pkgs/c/compat.mysql-connector-cpp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package = {
xpm = {
linux = {
deps = {
"compat:libmysqlclient@8.4.6",
"compat:libmysqlclient@8.4.6.1",
"compat:openssl@3.5.1",
"xim:cmake@latest",
"xim:make@latest",
Expand All @@ -23,7 +23,7 @@ package = {
},
macosx = {
deps = {
"compat:libmysqlclient@8.4.6",
"compat:libmysqlclient@8.4.6.1",
"compat:openssl@3.5.1",
"xim:cmake@latest",
},
Expand All @@ -41,7 +41,7 @@ package = {
include_dirs = { "include" },
targets = { ["mysql_connector_cpp"] = { kind = "lib" } },
deps = {
["compat.libmysqlclient"] = "8.4.6",
["compat.libmysqlclient"] = "8.4.6.1",
["compat.openssl"] = "3.5.1",
},

Expand Down Expand Up @@ -141,7 +141,7 @@ local function find_source_root()
end

local function find_mysql_source_root(prefix)
local direct = path.join(prefix, "libmysqlclient-8.4.6")
local direct = path.join(prefix, "libmysqlclient-8.4.6.1")
if os.isfile(path.join(direct, "mcpp.toml")) then return direct end
for _, manifest in ipairs(os.files(path.join(prefix, "**", "mcpp.toml")) or {}) do
local root = path.directory(manifest)
Expand Down Expand Up @@ -198,7 +198,7 @@ function install()
.. " deps=" .. tostring(pkginfo.deps_list()))
local ok, result = pcall(function()
local srcroot = find_source_root()
local mysql = find_dep_install_dir("compat:libmysqlclient", "8.4.6")
local mysql = find_dep_install_dir("compat:libmysqlclient", "8.4.6.1")
local openssl = find_dep_install_dir("compat:openssl", "3.5.1")
hook_log("srcroot=" .. tostring(srcroot) .. " mysql=" .. tostring(mysql)
.. " openssl=" .. tostring(openssl))
Expand Down
4 changes: 2 additions & 2 deletions tests/examples/libmysqlclient/mcpp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ version = "0.1.0"

# libmysqlclient 的 mcpp 源码构建目前只验证 Linux/macOS。
[target.'cfg(linux)'.dependencies.compat]
libmysqlclient = "8.4.6"
libmysqlclient = "8.4.6.1"

[target.'cfg(linux)'.build]
cxxflags = ["-DHAVE_LIBMYSQLCLIENT=1"]

[target.'cfg(macos)'.dependencies.compat]
libmysqlclient = "8.4.6"
libmysqlclient = "8.4.6.1"

[target.'cfg(macos)'.build]
cxxflags = ["-DHAVE_LIBMYSQLCLIENT=1"]
Loading