diff --git a/packages/c/cello/xmake.lua b/packages/c/cello/xmake.lua index 189314f26d0..c2e45c6e95b 100644 --- a/packages/c/cello/xmake.lua +++ b/packages/c/cello/xmake.lua @@ -18,7 +18,7 @@ package("cello") add_defines("CELLO_NSTRACE") end - on_install("!wasm and !windows|arm64", function(package) + on_install("!wasm and (windows|!arm64 or !windows)", function(package) io.writefile("xmake.lua", [[ add_rules("mode.release", "mode.debug") target("cello") diff --git a/packages/l/libdicom/xmake.lua b/packages/l/libdicom/xmake.lua index a6397da147b..a37f55c4cd4 100644 --- a/packages/l/libdicom/xmake.lua +++ b/packages/l/libdicom/xmake.lua @@ -14,7 +14,11 @@ package("libdicom") end add_deps("uthash") - on_install("windows|!arm64", "linux", "macosx", "bsd", "mingw", "msys", "iphoneos", "cross", function (package) + if is_plat("linux", "wasm") then + add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) + end + + on_install("!android and (windows|!arm64 or !windows)", function (package) local configs = {"-Dtests=false"} table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static")) import("package.tools.meson").install(package, configs) diff --git a/packages/s/stringzilla/xmake.lua b/packages/s/stringzilla/xmake.lua index 9286c1ddb43..28476e80238 100644 --- a/packages/s/stringzilla/xmake.lua +++ b/packages/s/stringzilla/xmake.lua @@ -39,7 +39,7 @@ package("stringzilla") add_versions("v2.0.3", "6b52a7b4eb8383cbcf83608eaa08e5ba588a378449439b73584713a16d8920e3") add_versions("v1.2.2", "2e17c49965841647a1c371247f53b2f576e5fb32fe4b84a080d425b12f17703c") - on_install("android|!armeabi-v7a",function (package) + on_install("android|!armeabi-v7a or !android",function (package) if package:version():gt("2.0.4") then os.cp("include/stringzilla/stringzilla.h", package:installdir("include")) else diff --git a/packages/t/tobiaslocker_base64/xmake.lua b/packages/t/tobiaslocker_base64/xmake.lua index 8ad0390340b..586d4a334ea 100644 --- a/packages/t/tobiaslocker_base64/xmake.lua +++ b/packages/t/tobiaslocker_base64/xmake.lua @@ -7,7 +7,7 @@ package("tobiaslocker_base64") add_urls("https://github.com/tobiaslocker/base64.git") add_versions("2024.02.26", "387b32f337b83d358ac1ffe574e596ba99c41d31") - on_install("windows|!arm64", function (package) + on_install("windows|!arm64 or !windows", function (package) os.cp("include/base64.hpp", package:installdir("include/tobiaslocker_base64")) end)