diff --git a/check_patches_clean_apply.py b/check_patches_clean_apply.py index b5b4546a6..dd789799e 100644 --- a/check_patches_clean_apply.py +++ b/check_patches_clean_apply.py @@ -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"}) @@ -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) diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 745913c63..ad156fd11 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -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: @@ -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 }}"]