From 3ffde966fadb2c1aa330e1f6e713b88a4daafd92 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:20:59 +0800 Subject: [PATCH] drogon: fix zlib conflict (#2747) --- packages/d/drogon/xmake.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/d/drogon/xmake.lua b/packages/d/drogon/xmake.lua index 408f6e722..39b77de7a 100644 --- a/packages/d/drogon/xmake.lua +++ b/packages/d/drogon/xmake.lua @@ -34,7 +34,7 @@ package("drogon") add_configs("sqlite3", {description = "Enable sqlite3 support.", default = false, type = "boolean"}) add_deps("cmake") - add_deps("trantor", "jsoncpp", "brotli", "zlib") + add_deps("trantor", "jsoncpp", "brotli") if is_plat("windows") then add_syslinks("ws2_32", "rpcrt4", "crypt32", "advapi32", "iphlpapi") @@ -57,9 +57,13 @@ package("drogon") package:add("deps", dep) end end + + if not table.contains(package:get("deps"), "mysql") then + package:add("deps", "zlib") + end end) - on_install("windows|x64", "macosx", "linux", function (package) + on_install("windows", "macosx", "linux", function (package) io.replace("cmake/templates/config.h.in", "\"@COMPILATION_FLAGS@@DROGON_CXX_STANDARD@\"", "R\"(@COMPILATION_FLAGS@@DROGON_CXX_STANDARD@)\"", {plain = true}) local configs = {"-DBUILD_EXAMPLES=OFF"}