Skip to content

Commit

Permalink
Add libabseil and libprotobuf to the run_constrained of ros-distro-mu…
Browse files Browse the repository at this point in the history
…tex (#464)

* Add libabseil and libprotobuf to the run_constrained of ros-distro-mutex

* Inject libprotobuf and libabseil dependency in each package that depends on Gazebo
  • Loading branch information
traversaro authored Apr 7, 2024
1 parent 5f3a15d commit 4635ba8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 5 additions & 1 deletion additional_recipes/ros-distro-mutex/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package:
version: 0.5.0

build:
number: 4
number: 5
string: noetic
run_exports:
- "{{ pin_subpackage('ros-distro-mutex', max_pin='x.x') }}"
Expand All @@ -27,11 +27,15 @@ requirements:
# values here should be applied from run_exports!
# if the upstream package does not have run_exports
# please change it in the conda_build_config.yaml!
# libabseil and libprotobuf added here as a workaround for
# https://github.com/RoboStack/ros-noetic/issues/459
run_constrained:
- libboost-devel 1.82
- gazebo 11
- ogre 1.10.12
- libpqxx 7.8
- libabseil 20230802
- libprotobuf 4.24.3

about:
home: https://github.com/robostack/ros-noetic
Expand Down
10 changes: 5 additions & 5 deletions conda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ g++-static:
gawk:
conda: [gawk]
gazebo:
conda: [gazebo]
conda: [gazebo, libprotobuf, libabseil]
gazebo11:
conda: [gazebo]
conda: [gazebo, libprotobuf, libabseil]
gazebo9:
conda: [gazebo]
conda: [gazebo, libprotobuf, libabseil]
geographiclib:
conda: [geographiclib-cpp]
geographiclib-tools:
Expand Down Expand Up @@ -268,9 +268,9 @@ libfreetype6-dev:
libftdi-dev:
conda: [libftdi, libusb]
libgazebo11-dev:
conda: [gazebo]
conda: [gazebo, libprotobuf, libabseil]
libgazebo9-dev:
conda: [gazebo]
conda: [gazebo, libprotobuf, libabseil]
libgdal-dev:
conda: [libgdal]
libgeos++-dev:
Expand Down
10 changes: 5 additions & 5 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ g++-static:
gawk:
robostack: [gawk]
gazebo:
robostack: [gazebo]
robostack: [gazebo, libprotobuf, libabseil]
gazebo11:
robostack: [gazebo]
robostack: [gazebo, libprotobuf, libabseil]
gazebo9:
robostack: [gazebo]
robostack: [gazebo, libprotobuf, libabseil]
geographiclib:
robostack: [geographiclib-cpp]
geographiclib-tools:
Expand Down Expand Up @@ -264,9 +264,9 @@ libfreetype6-dev:
libftdi-dev:
robostack: [libftdi, libusb]
libgazebo11-dev:
robostack: [gazebo]
robostack: [gazebo, libprotobuf, libabseil]
libgazebo9-dev:
robostack: [gazebo]
robostack: [gazebo, libprotobuf, libabseil]
libgdal-dev:
robostack: [libgdal]
libgeos++-dev:
Expand Down

0 comments on commit 4635ba8

Please sign in to comment.