From 741beb64ce118ae471cbbc5a04107d1afa38d17a Mon Sep 17 00:00:00 2001 From: Daisuke Sato Date: Tue, 20 Sep 2022 22:10:53 +0900 Subject: [PATCH] Fix build error on Ubuntu 20.04 + ROS Noetic/Melodic (#1745) * Fix build error on Ubuntu 20.04 + ROS Noetic Signed-off-by: Daisuke Sato --- Dockerfile.melodic | 3 ++- Dockerfile.noetic | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile.melodic b/Dockerfile.melodic index 35e8399..90f6f69 100644 --- a/Dockerfile.melodic +++ b/Dockerfile.melodic @@ -32,7 +32,8 @@ ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/head COPY cartographer_ros.rosinstall cartographer_ros/ COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/ RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \ - cartographer_ros/scripts/prepare_catkin_workspace.sh + cartographer_ros/scripts/prepare_catkin_workspace.sh && \ + sed -i -e "s%libabsl-dev%<\!--libabsl-dev-->%g" catkin_ws/src/cartographer/package.xml # rosdep needs the updated package.xml files to install the correct debs. COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/ diff --git a/Dockerfile.noetic b/Dockerfile.noetic index 7168d10..18eded2 100644 --- a/Dockerfile.noetic +++ b/Dockerfile.noetic @@ -36,7 +36,8 @@ ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/head COPY cartographer_ros.rosinstall cartographer_ros/ COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/ RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \ - cartographer_ros/scripts/prepare_catkin_workspace.sh + cartographer_ros/scripts/prepare_catkin_workspace.sh && \ + sed -i -e "s%libabsl-dev%<\!--libabsl-dev-->%g" catkin_ws/src/cartographer/package.xml # rosdep needs the updated package.xml files to install the correct debs. COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/