From 9f88d8a7e891e327ba4d2fefdcc77c40e4b42097 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 28 Oct 2023 11:55:24 +0200 Subject: [PATCH] Build: Forcefully disable asan for package not supporting it wayland, libcurl and ffmpeg --- plugins/FFmpeg/xmake.lua | 2 +- xmake.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/FFmpeg/xmake.lua b/plugins/FFmpeg/xmake.lua index ed3ee4b66..bdda1d4ae 100644 --- a/plugins/FFmpeg/xmake.lua +++ b/plugins/FFmpeg/xmake.lua @@ -1,7 +1,7 @@ option("ffmpeg", { description = "Build FFmpeg plugin", default = false, category = "Plugins" }) if has_config("ffmpeg") then - add_requires("ffmpeg", { configs = { shared = true } }) + add_requires("ffmpeg", { configs = { asan = false, shared = true } }) target("PluginFFmpeg") set_group("Plugins") diff --git a/xmake.lua b/xmake.lua index 874aaa6dd..c5ff89b3a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -300,9 +300,9 @@ if has_config("network") then -- emscripten fetch API is used for WebService on wasm if not is_plat("wasm") then if has_config("link_curl") then - add_requires("libcurl") + add_requires("libcurl", { configs = { asan = false } }) else - add_requires("libcurl", { configs = { shared = true }}) + add_requires("libcurl", { configs = { asan = false, shared = true }}) end end end @@ -360,7 +360,7 @@ if is_plat("linux", "android") then end if is_plat("linux") then - add_requires("libxext", "wayland") + add_requires("libxext", "wayland", { configs = { asan = false } }) end ----------------------- Global config -----------------------