Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/u/usd/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("usd")
add_urls("https://github.com/PixarAnimationStudios/USD/archive/refs/tags/$(version).tar.gz",
"https://github.com/PixarAnimationStudios/USD.git")

add_versions("v25.11", "c37c633b5037a4552f61574670ecca8836229b78326bd62622f3422671188667")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This automated update adds version v25.11 but overlooks the version-specific compatibility check on lines 43-47. This check prevents build failures for v25.08 with the clang toolchain on Linux. This omission introduces a risk of build failures for v25.11 on that platform.

To prevent this, the check should be updated. If the incompatibility persists in v25.11, you could modify the check like this:

if package:version() and (package:version():eq("25.08") or package:version():eq("25.11")) and
    package:is_plat("linux") and package:has_tool("cxx", "clang") then
    raise("package(usd " .. package:version():__tostring() .. ") unsupported clang toolchain")
end

If the issue is resolved in v25.11, adding a comment to the existing check to clarify why it is specific to v25.08 would improve maintainability.

add_versions("v25.08", "2a93c2390ae35a3e312f3fb66e6f403a0e046893e3f0d706be82963345a08cb3")
add_versions("v25.05.01", "f424e8db26e063a1b005423ee52142e75c38185bbd4b8126ef64173e906dd50f")
add_versions("v25.05", "231faca9ab71fa63d6c1e0da18bda0c365f82d9bef1cfd4b3d3d6784c8d5fb96")
Expand Down Expand Up @@ -39,10 +40,10 @@ package("usd")
if not package:is_plat("macosx") then
assert(package:is_arch("x64", "x86_64"), "package(usd) only support x86")
end
if package:version() and package:version():eq("25.08") and
if package:version() and package:version():ge("25.08") and
package:is_plat("linux") and package:has_tool("cxx", "clang") then

raise("package(usd v25.08) unsupported clang toolchain")
raise("package(usd >=v25.08) unsupported clang toolchain")
end
end)
end
Expand Down
Loading