From 8fcd5838a43603c6bd9978fc491ba7cafd53871d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 15 May 2018 00:10:04 +0000 Subject: [PATCH] moveit-core: fix build with gcc8 http://errors.yoctoproject.org/Errors/Details/178616/ Signed-off-by: Martin Jansa [lukas.bulwahn@gmail.com: adjusted patch filename and included Upstream-Status] Signed-off-by: Lukas Bulwahn --- ...type-to-pass-GCC8-static-assert.-888.patch | 32 +++++++++++++++++++ recipes-ros/moveit/moveit-core_0.7.13.bb | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 recipes-ros/moveit/moveit-core/0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch diff --git a/recipes-ros/moveit/moveit-core/0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch b/recipes-ros/moveit/moveit-core/0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch new file mode 100644 index 0000000..e0adba2 --- /dev/null +++ b/recipes-ros/moveit/moveit-core/0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch @@ -0,0 +1,32 @@ +From 89a976959e6a84b363ea2c5e53685b2e2b810711 Mon Sep 17 00:00:00 2001 +From: Maarten de Vries +Date: Fri, 11 May 2018 07:55:17 +0200 +Subject: [PATCH] Fix allocator type to pass GCC8 static assert. (#888) + +Upstream-Status: Backport [from kinetic, https://github.com/ros-planning/moveit/commit/89a976959e6a84b363ea2c5e53685b2e2b810711] + +This patch has been generated with: + `git format-patch -1 89a976959e6a84b363ea2c5e53685b2e2b810711` +in the moveit repository. + +Signed-off-by: Lukas Bulwahn +--- + moveit_core/robot_model/include/moveit/robot_model/link_model.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/moveit_core/robot_model/include/moveit/robot_model/link_model.h b/moveit_core/robot_model/include/moveit/robot_model/link_model.h +index d8aec2f..3f2b1b6 100644 +--- a/moveit_core/robot_model/include/moveit/robot_model/link_model.h ++++ b/moveit_core/robot_model/include/moveit/robot_model/link_model.h +@@ -65,7 +65,7 @@ typedef std::map LinkModelMapConst; + + /** \brief Map from link model instances to Eigen transforms */ + typedef std::map, +- Eigen::aligned_allocator > > ++ Eigen::aligned_allocator > > + LinkTransformMap; + + /** \brief A link from the robot. Contains the constant transform applied to the link and its geometry */ +-- +2.7.4 + diff --git a/recipes-ros/moveit/moveit-core_0.7.13.bb b/recipes-ros/moveit/moveit-core_0.7.13.bb index 6f63c68..70f83a9 100644 --- a/recipes-ros/moveit/moveit-core_0.7.13.bb +++ b/recipes-ros/moveit/moveit-core_0.7.13.bb @@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de DEPENDS = "roslib boost eigen-conversions fcl octomap eigen-stl-containers geometric-shapes kdl-parser moveit-msgs srdfdom cmake-modules" require moveit.inc + +SRC_URI += "file://0001-Fix-allocator-type-to-pass-GCC8-static-assert.-888.patch;patchdir=.."