From 8e87b47005c4e081210b4d12e890b7f47062456a Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 16 Jun 2018 15:08:12 +0200 Subject: [PATCH] message-filters: build with gcc-8 This addresses two build issues in kobuki-auto-docking [1], and image-transport [2] due to openembedded-core updating to gcc-8. [1] http://errors.yoctoproject.org/Errors/Details/178608/ [2] http://errors.yoctoproject.org/Errors/Details/178606/ This commit was based on a earlier commit from Martin Jansa in his meta-ros fork, but then heavily re-worked. Signed-off-by: Lukas Bulwahn --- ...on-to-add-to-conform-template-syntax.patch | 35 +++++++++++++++++++ .../ros-comm/message-filters_1.11.21.bb | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 recipes-ros/ros-comm/message-filters/0001-Changed-invocation-to-add-to-conform-template-syntax.patch diff --git a/recipes-ros/ros-comm/message-filters/0001-Changed-invocation-to-add-to-conform-template-syntax.patch b/recipes-ros/ros-comm/message-filters/0001-Changed-invocation-to-add-to-conform-template-syntax.patch new file mode 100644 index 0000000..b7522f7 --- /dev/null +++ b/recipes-ros/ros-comm/message-filters/0001-Changed-invocation-to-add-to-conform-template-syntax.patch @@ -0,0 +1,35 @@ +From 65e4ce3de9747e359f38db65cf78763f75bcfbd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B8rgen=20Nordmoen?= +Date: Fri, 4 May 2018 15:50:39 +0200 +Subject: [PATCH] Changed invocation to `add` to conform template syntax + (#1388) + +This change fixes issue #1383 + +Upstream-Status: Backport [from melodic, https://github.com/ros/ros_comm/commit/65e4ce3de9747e359f38db65cf78763f75bcfbd1] + +This patch has been generated with: + `git format-patch -1 65e4ce3de9747e359f38db65cf78763f75bcfbd1` +in the ros_comm repository. + +Signed-off-by: Lukas Bulwahn +--- + utilities/message_filters/include/message_filters/synchronizer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utilities/message_filters/include/message_filters/synchronizer.h b/utilities/message_filters/include/message_filters/synchronizer.h +index 7891890..1c14a6f 100644 +--- a/utilities/message_filters/include/message_filters/synchronizer.h ++++ b/utilities/message_filters/include/message_filters/synchronizer.h +@@ -355,7 +355,7 @@ private: + template + void cb(const typename mpl::at_c::type& evt) + { +- this->add(evt); ++ this->template add(evt); + } + + uint32_t queue_size_; +-- +2.7.4 + diff --git a/recipes-ros/ros-comm/message-filters_1.11.21.bb b/recipes-ros/ros-comm/message-filters_1.11.21.bb index 9a338b3..08a18d4 100644 --- a/recipes-ros/ros-comm/message-filters_1.11.21.bb +++ b/recipes-ros/ros-comm/message-filters_1.11.21.bb @@ -8,3 +8,5 @@ DEPENDS = "boost rosconsole roscpp xmlrpcpp" require ros-comm.inc ROS_PKG_SUBDIR = "utilities" + +SRC_URI += "file://0001-Changed-invocation-to-add-to-conform-template-syntax.patch;patchdir=../.."