Merge branch 'main' into sb/no-networksb/no-network

6 files changed, 33 insertions, 20 deletions

diff --git a/repo/packages/c/consul/xmake.lua b/repo/packages/c/consul/xmake.lua
index 6982e6f03..82bd803b6 100644
--- a/repo/packages/c/consul/xmake.lua
+++ b/repo/packages/c/consul/xmake.lua
@@ -29,10 +29,14 @@ package("consul")
     end)
 
     on_test(function (package)
+        -- Skip binary verification when cross-compiling (e.g. Windows target on Linux host)
+        if package:is_cross() then
+            return
+        end
         if is_plat("windows") then
             os.run("%s version", package:installdir("bin", "consul.exe"))
-        elseif is_plat("linux") then 
-            -- this should include macosx as well, but needs more logic to differentiate arm64 vs 
+        elseif is_plat("linux") then
+            -- this should include macosx as well, but needs more logic to differentiate arm64 vs
             -- amd64 since arm64 binary won't run on amd64 macs. arm64 macs have Rosetta though so
             -- they can run the amd64 binary.
             os.run("%s version", package:installdir("bin", "consul"))
diff --git a/repo/packages/m/mimalloc/xmake.lua b/repo/packages/m/mimalloc/xmake.lua
index 993e4c1a9..54d6613b8 100644
--- a/repo/packages/m/mimalloc/xmake.lua
+++ b/repo/packages/m/mimalloc/xmake.lua
@@ -35,7 +35,7 @@ package("mimalloc")
     end
 
     on_install("macosx", "windows", "linux", "android", "mingw", function (package)
-        local configs = {"-DMI_OVERRIDE=OFF"}
+        local configs = {"-DMI_OVERRIDE=OFF", "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")}
         table.insert(configs, "-DMI_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
         table.insert(configs, "-DMI_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DMI_SECURE=" .. (package:config("secure") and "ON" or "OFF"))
@@ -71,5 +71,7 @@ package("mimalloc")
     end)
 
     on_test(function (package)
-        assert(package:has_cfuncs("mi_malloc", {includes = "mimalloc.h"}))
+        if not package:is_cross() then
+            assert(package:has_cfuncs("mi_malloc", {includes = "mimalloc.h"}))
+        end
     end)
diff --git a/repo/packages/n/nomad/xmake.lua b/repo/packages/n/nomad/xmake.lua
index 85ea10985..20380e1a1 100644
--- a/repo/packages/n/nomad/xmake.lua
+++ b/repo/packages/n/nomad/xmake.lua
@@ -29,6 +29,9 @@ package("nomad")
     end)
 
     on_test(function (package)
+        if package:is_cross() then
+            return
+        end
         if is_plat("windows") then
             os.run("%s version", package:installdir("bin", "nomad.exe"))
         elseif is_plat("linux") then
diff --git a/repo/packages/o/oidctoken/xmake.lua b/repo/packages/o/oidctoken/xmake.lua
index 76360e7bf..4dc231b21 100644
--- a/repo/packages/o/oidctoken/xmake.lua
+++ b/repo/packages/o/oidctoken/xmake.lua
@@ -15,6 +15,9 @@ package("oidctoken")
     end)
 
     on_test(function (package)
+        if package:is_cross() then
+            return
+        end
         if is_plat("windows") then
             os.run("%s --help", package:installdir("bin", "OidcToken.exe"))
         else
diff --git a/repo/packages/s/sentry-native/patches/0.12.1/crashpad_static_libcxx.patch b/repo/packages/s/sentry-native/patches/0.12.1/crashpad_static_libcxx.patch
index 2005ad4ec..8d0a8f11e 100644
--- a/repo/packages/s/sentry-native/patches/0.12.1/crashpad_static_libcxx.patch
+++ b/repo/packages/s/sentry-native/patches/0.12.1/crashpad_static_libcxx.patch
@@ -1,24 +1,25 @@
 --- a/external/crashpad/handler/CMakeLists.txt	2026-03-09 14:47:42.109197582 +0000
 +++ b/external/crashpad/handler/CMakeLists.txt	2026-03-09 14:51:45.343538268 +0000
-@@ -120,6 +120,21 @@
+@@ -120,6 +120,22 @@
          endif()
      endif()
- 
+
++    # Statically link libc++ and libc++abi into crashpad_handler so it has
++    # no runtime dependency on libc++.so.1. This is needed when building with
++    # a toolchain that uses libc++ (e.g. UE clang) but deploys to systems
++    # where libc++.so.1 is not available.
++    # Only applied when -stdlib=libc++ is active (i.e. not GCC or system clang
++    # using libstdc++).
 +    if(LINUX)
-+        # Statically link libc++ and libc++abi into crashpad_handler so it has
-+        # no runtime dependency on libc++.so.1. This is needed when building with
-+        # a toolchain that uses libc++ (e.g. UE clang) but deploys to systems
-+        # where libc++.so.1 is not available.
-+        # -nostdlib++ suppresses clang's automatic -lc++ addition (a linker flag,
-+        # added at the end). The explicit -Bstatic libs are added via
-+        # target_link_libraries so they appear after crashpad's static archives in
-+        # the link order, letting the single-pass linker resolve all libc++ symbols.
-+        target_link_options(crashpad_handler PRIVATE -nostdlib++)
-+        target_link_libraries(crashpad_handler PRIVATE
-+            -Wl,-Bstatic,-lc++,-lc++abi,-Bdynamic
-+        )
++        string(FIND "${CMAKE_CXX_FLAGS}" "-stdlib=libc++" _libcxx_pos)
++        if(NOT _libcxx_pos EQUAL -1)
++            target_link_options(crashpad_handler PRIVATE -nostdlib++)
++            target_link_libraries(crashpad_handler PRIVATE
++                -Wl,-Bstatic,-lc++,-lc++abi,-Bdynamic
++            )
++        endif()
 +    endif()
 +
      set_property(TARGET crashpad_handler PROPERTY EXPORT_NAME crashpad_handler)
      add_executable(crashpad::handler ALIAS crashpad_handler)
- 
+
diff --git a/repo/packages/s/sentry-native/xmake.lua b/repo/packages/s/sentry-native/xmake.lua
index 43672b9de..0da513ead 100644
--- a/repo/packages/s/sentry-native/xmake.lua
+++ b/repo/packages/s/sentry-native/xmake.lua
@@ -37,7 +37,7 @@ package("sentry-native")
     add_versions("0.4.4", "fe6c711d42861e66e53bfd7ee0b2b226027c64446857f0d1bbb239ca824a3d8d")
     add_patches("0.4.4", path.join(os.scriptdir(), "patches", "0.4.4", "zlib_fix.patch"), "1a6ac711b7824112a9062ec1716a316facce5055498d1f87090d2cad031b865b")
     add_patches("0.7.6", path.join(os.scriptdir(), "patches", "0.7.6", "breakpad_exceptions.patch"), "7781bad0404a92252cbad39e865d17ac663eedade03cbd29c899636c7bfab1b5")
-    add_patches("0.12.1", path.join(os.scriptdir(), "patches", "0.12.1", "crashpad_static_libcxx.patch"), "3c2115b90179808fa639865f6eb23090e2cb6025d816ffb66c2d75c26473ec72")
+    add_patches("0.12.1", path.join(os.scriptdir(), "patches", "0.12.1", "crashpad_static_libcxx.patch"), "e297c1b9dc58f446edfec5566a73c9e3e6b53c207f7247d45b93c640af2bff1a")
     add_patches("0.12.1", path.join(os.scriptdir(), "patches", "0.12.1", "breakpad_exceptions.patch"), "9e0cd152192f87b9ce182c8ddff22c0471acb99bd61a872ca48afbbacdf27575")
 
     add_deps("cmake")