Skip to content

Align with ros-jazzy #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2025
Merged

Align with ros-jazzy #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions check_patches_clean_apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def prepare_patch_recipes() -> List[Path]:
continue
filtered = filter_sources(src_section)
if not filtered:
# No patches → skip
# No patches -> skip
continue

pkg = recipe.get("package", {"name": recipe_file.parent.name, "version": "0"})
Expand All @@ -137,7 +137,7 @@ def run_rattler_build() -> None:
"--recipe-dir",
str(PATCH_RECIPES_DIR)
]
print("\n Running:", " ".join(cmd), "\n", flush=True)
print("\n Running:", " ".join(cmd), "\n", flush=True)
subprocess.run(cmd, check=True)


Expand Down
4 changes: 3 additions & 1 deletion patch/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ behaviortree_cpp:
add_host: ["libboost-devel", "cppzmq", "zeromq", "sqlite"]
add_run: ["libboost"]
plotjuggler:
add_host: ["libxcb", "${{ 'elfutils' if linux }}", "ros-humble-ros-workspace"]
add_host: ["libxcb", "${{ 'elfutils' if linux }}", "ros-humble-ros-workspace", "git-lfs"]
embree_vendor:
add_host: ["REQUIRE_OPENGL", "libpng", "libjpeg-turbo", "openimageio", "tbb", "tbb-devel", "embree"]
ign_rviz_common:
Expand Down Expand Up @@ -92,6 +92,8 @@ popf:
rtabmap:
add_host: ["REQUIRE_OPENGL", "ceres-solver", "libdc1394", "libusb", "vtk"]
backward_ros:
# binutils is added only on linux to avoid the -liberty library not found in macos
# see https://github.com/RoboStack/ros-jazzy/pull/95#issuecomment-3113166166
add_host: ["${{ 'binutils' if linux }}", "${{ 'elfutils' if linux }}", "ros-humble-ament-cmake-libraries"]
nav2_smac_planner:
add_build: ["${{ 'llvm-openmp' if osx }}"]
Expand Down
Loading