From 514d4f5e3a8a18eccad65fb681d9920f382957e4 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 7 Jun 2018 00:58:55 +0200 Subject: [PATCH] ros-canopen: update to 0.6.9 This commit also drops a patch for socketcan-interface that is now included in the updated version. Signed-off-by: Lukas Bulwahn --- .../{can-msgs_0.6.8.bb => can-msgs_0.6.9.bb} | 0 recipes-ros/ros-canopen/ros-canopen.inc | 4 +- ...dge_0.6.8.bb => socketcan-bridge_0.6.9.bb} | 0 ...de-iostream-to-compile-with-boost-1..patch | 58 ------------------- ..._0.6.8.bb => socketcan-interface_0.6.9.bb} | 1 - 5 files changed, 2 insertions(+), 61 deletions(-) rename recipes-ros/ros-canopen/{can-msgs_0.6.8.bb => can-msgs_0.6.9.bb} (100%) rename recipes-ros/ros-canopen/{socketcan-bridge_0.6.8.bb => socketcan-bridge_0.6.9.bb} (100%) delete mode 100644 recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch rename recipes-ros/ros-canopen/{socketcan-interface_0.6.8.bb => socketcan-interface_0.6.9.bb} (89%) diff --git a/recipes-ros/ros-canopen/can-msgs_0.6.8.bb b/recipes-ros/ros-canopen/can-msgs_0.6.9.bb similarity index 100% rename from recipes-ros/ros-canopen/can-msgs_0.6.8.bb rename to recipes-ros/ros-canopen/can-msgs_0.6.9.bb diff --git a/recipes-ros/ros-canopen/ros-canopen.inc b/recipes-ros/ros-canopen/ros-canopen.inc index bcf6e83..71bc27c 100644 --- a/recipes-ros/ros-canopen/ros-canopen.inc +++ b/recipes-ros/ros-canopen/ros-canopen.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-industrial/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "dfee31155f203178be7a7d537a75f162" -SRC_URI[sha256sum] = "ea66ce536c2f64c0bb3642d7c91df8e3f2e9b54e6ca102c97d6c7429becc8b85" +SRC_URI[md5sum] = "d1627c81221dfd88bfcf960914856e7b" +SRC_URI[sha256sum] = "d91b854d3cfed6d996a44c79d6978e335459d97dd5b467516839df5c71dc510d" S = "${WORKDIR}/${ROS_SPN}-${PV}/${ROS_BPN}" diff --git a/recipes-ros/ros-canopen/socketcan-bridge_0.6.8.bb b/recipes-ros/ros-canopen/socketcan-bridge_0.6.9.bb similarity index 100% rename from recipes-ros/ros-canopen/socketcan-bridge_0.6.8.bb rename to recipes-ros/ros-canopen/socketcan-bridge_0.6.9.bb diff --git a/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch b/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch deleted file mode 100644 index bd46789..0000000 --- a/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch +++ /dev/null @@ -1,58 +0,0 @@ -From 221747309d445a38412c2bb97c4b06e301ea7136 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 2 Dec 2017 09:17:02 +0100 -Subject: [PATCH] explicitly include iostream to compile with boost >= 1.65.0 - -When compiling with boost version >= 1.65.0, it fails with: -``` -In file included from /[...]/include/socketcan_interface/asio_base.h:4:0, - from /[...]/include/socketcan_interface/socketcan.h:4, - from /[...]/src/socketcan_interface_plugin.cpp:2: -/[...]/include/socketcan_interface/socketcan.h: In member function 'virtual bool can::SocketCANInterface::enqueue(const can::Frame&)': -/[...]/include/socketcan_interface/interface.h:202:96: error: 'cout' is not a member of 'std' - #define LOG(log) { boost::mutex::scoped_lock _cout_lock(_cout_wrapper::get_cout_mutex()); std::cout << log << std::endl; } - ^ -/[...]/include/socketcan_interface/socketcan.h:183:13: note: in expansion of macro 'LOG' - LOG("FAILED " << ec); - ^ -/[...]/include/socketcan_interface/interface.h:202:96: note: suggested alternative: 'count' -``` - -With boost version < 1.65.0, iostream is probably included by the -boost dependencies in the header files; with boost version >= 1.65.0, -it is not included anymore and hence leads to this compile error. - -The issue was identified by the work on meta-ros, the OpenEmbedded -layer for ROS [1,2]. It provides a cross-compilation tool chain for -ROS packages and its current master version already uses boost -version 1.65.1. - -[1] https://github.com/bmwcarit/meta-ros -[2] https://github.com/bulwahn/meta-ros/pull/8 - -Signed-off-by: Lukas Bulwahn - -Upstream-Status: Accepted [https://github.com/ros-industrial/ros_canopen/commit/3bf9d9726b278b000a829f639af21d423a38798a] - -This patch has been generated with: - `git format-patch -1 3bf9d9726b278b000a829f639af21d423a38798a` -in the ros_canopen repository. - -Signed-off-by: Lukas Bulwahn - ---- - socketcan_interface/include/socketcan_interface/interface.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/socketcan_interface/include/socketcan_interface/interface.h b/socketcan_interface/include/socketcan_interface/interface.h -index a78a392..0912bc7 100644 ---- a/socketcan_interface/include/socketcan_interface/interface.h -+++ b/socketcan_interface/include/socketcan_interface/interface.h -@@ -190,6 +190,7 @@ public: - - } // namespace can - -+#include - #include - - struct _cout_wrapper{ diff --git a/recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb b/recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb similarity index 89% rename from recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb rename to recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb index 34a9e0c..2ca45f3 100644 --- a/recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb +++ b/recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb @@ -7,7 +7,6 @@ DEPENDS = "boost class-loader virtual/kernel" require ros-canopen.inc -SRC_URI += "file://0001-explicitly-include-iostream-to-compile-with-boost-1..patch;striplevel=2" SRC_URI += "file://0001-find-and-link-the-thread-library-properly.patch;striplevel=2" SRC_URI += "file://0001-compile-also-with-boost-1.66.0.patch;striplevel=2"