From 0ab8e3373852a19dbd96412b39103b956ee655da Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Tue, 18 May 2021 19:44:21 +0300 Subject: [PATCH] Test --- builder/image-ros.sh | 2 ++ clover/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index d565f6cc..a6367b11 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -103,6 +103,8 @@ ros-${ROS_DISTRO}-web-video-server echo_stamp "Installing libboost-dev" # https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6536 my_travis_retry apt-get install -y --no-install-recommends libboost-dev libboost-all-dev +cp /lib/arm-linux-gnueabihf/libpthread.so.0 /lib/arm-linux-gnueabihf/libpthreads.so + echo_stamp "Build and install Clover" cd /home/pi/catkin_ws # Don't try to install gazebo_ros diff --git a/clover/CMakeLists.txt b/clover/CMakeLists.txt index d0b46e2c..fc96fa95 100644 --- a/clover/CMakeLists.txt +++ b/clover/CMakeLists.txt @@ -186,7 +186,7 @@ add_executable(clover_led src/led.cpp) add_executable(shell src/shell.cpp) # FIXME: hack to fix https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6532 -string(REPLACE "-lpthreads;" "" catkin_LIBRARIES "${catkin_LIBRARIES}") +# string(REPLACE "-lpthreads;" "" catkin_LIBRARIES "${catkin_LIBRARIES}") target_link_libraries(simple_offboard ${catkin_LIBRARIES}