From 59904b67ec9cdd3c4098d1d69d09f165451ae634 Mon Sep 17 00:00:00 2001
From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com>
Date: Sun, 5 May 2024 13:40:13 +0100
Subject: [PATCH] fix limits for packages (#3946)

* tobiaslocker_base64: update excludes

* tobiaslocker_base64: remove limits

* tobiaslocker_base64: exclude windows arm64

* tobiaslocker_base64: update limits

* cello: fix limits

* stringzilla: fix limits

* libdicom: shorten limits

* libdicom: add comma

* tiny-optional: use shorter limits

* tiny-optional: undo change

* libdicom: exclude android

* libdicom: fix limits

* libdicom: disable shared for linux

* libdicom: disable shared for wasm
---
 packages/c/cello/xmake.lua               | 2 +-
 packages/l/libdicom/xmake.lua            | 6 +++++-
 packages/s/stringzilla/xmake.lua         | 2 +-
 packages/t/tobiaslocker_base64/xmake.lua | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/c/cello/xmake.lua b/packages/c/cello/xmake.lua
index 189314f26..c2e45c6e9 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 a6397da14..a37f55c4c 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 9286c1ddb..28476e802 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 8ad039034..586d4a334 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)