Merge pull request ekumenlabs#27 from Intermodalics/fix-rosbag_storag…

…e-linking Fix rosbag_storage static linking
jubeira · Nov 27, 2018 · f0cf43e · f0cf43e
2 parents 26eab5f + 0b59fc0
commit f0cf43e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 52 deletions.
diff --git a/do_everything.sh b/do_everything.sh
@@ -160,6 +160,9 @@ if [[ $skip -ne 1 ]] ; then
     # patch CMakeLists.txt for lz4 library - Build as a library
     apply_patch $my_loc/patches/lz4.patch
 
+    # patch rosbag_storage - Fix static linking due to missing BZIP2 dependency
+    apply_patch $my_loc/patches/rosbag_storage.patch
+
     # Patch collada - Build as static lib
     apply_patch $my_loc/patches/collada_dom.patch
 
@@ -218,8 +221,6 @@ if [[ $skip -ne 1 ]] ; then
     # Remove
     rm -fr $prefix/catkin_ws/src/geometry2/tf2_py
 
-    apply_patch $my_loc/patches/pcl_ros.patch
-
     # Patch roslib - weird issue with rospack.
     # TODO: Need to look further (only on catkin_make_isolated)
     # apply_patch /opt/roscpp_android/patches/roslib.patch

diff --git a/patches/pcl_ros.patch b/patches/pcl_ros.patch
diff --git a/patches/rosbag_storage.patch b/patches/rosbag_storage.patch
@@ -0,0 +1,11 @@
+--- catkin_ws/src/ros_comm/rosbag_storage/CMakeLists.txt
++++ catkin_ws/src/ros_comm/rosbag_storage/CMakeLists.txt
+@@ -15,7 +15,7 @@ catkin_package(
+   INCLUDE_DIRS include
+   LIBRARIES rosbag_storage
+   CATKIN_DEPENDS roslz4
+-  DEPENDS console_bridge Boost
++  DEPENDS console_bridge Boost BZIP2
+ )
+
+ # Support large bags (>2GB) on 32-bit systems