Skip to content

Commit

Permalink
Merge pull request #148 from traversaro/fixboostdepr
Browse files Browse the repository at this point in the history
Use libboost-* packages instead of deprecated boost and boost-cpp packages
  • Loading branch information
Tobias-Fischer committed Feb 24, 2024
2 parents 5d56cfc + 96cc965 commit bc68f99
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 30 deletions.
3 changes: 1 addition & 2 deletions additional_recipes/ros2-distro-mutex/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ requirements:
# This has to be synchronized with our current conda_build_config all the time :(
# host:
# # values here should
# - boost-cpp
# - log4cxx
# - poco
# - pcl
Expand All @@ -30,7 +29,7 @@ requirements:
# if the upstream package does not have run_exports
# please change it in the conda_build_config.yaml!
run_constrained:
- boost-cpp 1.82
- libboost 1.82
- libboost-devel 1.82
- pcl 1.13.1
- gazebo 11
Expand Down
12 changes: 6 additions & 6 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ pcl_ros:
rviz_rendering:
add_host: ["glew"]
behaviortree_cpp_v3:
add_host: ["boost-cpp", "cppzmq"]
add_run: ["boost-cpp"]
add_host: ["libboost-devel", "cppzmq"]
add_run: ["libboost"]
plotjuggler:
add_host: ["libxcb", {sel(linux): elfutils}, "ros-humble-ros-workspace"]
embree_vendor:
Expand All @@ -57,7 +57,7 @@ ign_rviz_plugins:
image_view:
add_host: ["REQUIRE_OPENGL"]
nao_lola:
add_host: ["boost"]
add_host: ["libboost-devel"]
ros_ign_gazebo:
add_host: ["ros-humble-std-msgs", "ros-humble-rclcpp", "REQUIRE_OPENGL"]
ros_ign_gazebo_demos:
Expand All @@ -73,8 +73,8 @@ libg2o:
fmilibrary_vendor:
add_host: ["fmilib"]
mrpt2:
add_host: ["assimp", "octomap", "tinyxml2", "boost-cpp", "jsoncpp", "gtest", "boost", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"]
add_run: ["assimp", "octomap", "tinyxml2", "boost-cpp", "jsoncpp", "gtest", "boost", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"]
add_host: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"]
add_run: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"]
add_build: [{"sel(linux)": "{{ cdt('libxcomposite-devel') }}"}]
ros1_rosbag_storage_vendor:
add_host: ["ros-noetic-roscpp", "ros-noetic-roslz4", "ros-noetic-rostest"]
Expand All @@ -89,7 +89,7 @@ nav2_smac_planner:
add_build: [{"sel(osx)": "llvm-openmp"}]
add_host: [{"sel(osx)": "llvm-openmp"}, "ompl", "libode"]
nav2_util:
add_host: ["boost-cpp"]
add_host: ["libboost-devel"]
nav2_constrained_smoother:
add_host: [{"sel(win)": "openblas"}]
ompl:
Expand Down
42 changes: 21 additions & 21 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ binutils:
bison:
robostack: [bison]
boost:
robostack: [boost]
robostack: [libboost-devel, libboost-python-devel]
bullet:
robostack: [bullet]
bzip2:
Expand Down Expand Up @@ -185,45 +185,45 @@ libabsl-dev:
libblas-dev:
robostack: [libblas, libcblas]
libboost-chrono-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-date-time:
robostack: [boost-cpp]
robostack: [libboost]
libboost-date-time-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-filesystem:
robostack: [boost-cpp]
robostack: [libboost]
libboost-filesystem-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-iostreams-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-program-options:
robostack: [boost-cpp]
robostack: [libboost]
libboost-program-options-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-python:
robostack: [boost]
robostack: [libboost-python]
libboost-python-dev:
robostack: [boost]
robostack: [libboost-python-devel]
libboost-random:
robostack: [boost-cpp]
robostack: [libboost]
libboost-random-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-regex-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-serialization:
robostack: [boost-cpp]
robostack: [libboost]
libboost-serialization-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-system:
robostack: [boost-cpp]
robostack: [libboost]
libboost-system-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libboost-thread:
robostack: [boost-cpp]
robostack: [libboost]
libboost-thread-dev:
robostack: [boost-cpp]
robostack: [libboost-devel]
libcairo2-dev:
robostack: [cairo]
libcap-dev:
Expand Down
2 changes: 1 addition & 1 deletion vinca_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ conda_index:
- robostack.yaml
- packages-ignore.yaml

build_number: 6
build_number: 7

mutex_package: ros2-distro-mutex 0.5 humble

Expand Down

0 comments on commit bc68f99

Please sign in to comment.