From e42adc2acdf426a1dbb8cce8bf4d6ab20941cfac Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Tue, 17 Sep 2019 23:55:04 +0200 Subject: [PATCH] [wip/sot-talos] add patch-aa to fix build with recent pinocchio --- sot-talos/distinfo | 1 + sot-talos/patches/patch-aa | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 sot-talos/patches/patch-aa diff --git a/sot-talos/distinfo b/sot-talos/distinfo index c561cba2..388731c2 100644 --- a/sot-talos/distinfo +++ b/sot-talos/distinfo @@ -1,3 +1,4 @@ SHA1 (sot-talos/sot-talos-1.0.6.tar.gz) = fdc39c672ee267e9b56af074ec2dd95909c2b0d6 RMD160 (sot-talos/sot-talos-1.0.6.tar.gz) = 0a0dbc81b016b915ec62b3343c39b9d0090f2889 Size (sot-talos/sot-talos-1.0.6.tar.gz) = 788940 bytes +SHA1 (patch-aa) = 1916306cf3fd504c3aae9829106e076b2f1a41e4 diff --git a/sot-talos/patches/patch-aa b/sot-talos/patches/patch-aa new file mode 100644 index 00000000..66803aa8 --- /dev/null +++ b/sot-talos/patches/patch-aa @@ -0,0 +1,33 @@ +include pinocchio before boost +ref https://github.com/stack-of-tasks/pinocchio/issues/849 + +--- src/sot-talos-device.cpp.orig 2019-03-04 17:58:29.000000000 +0100 ++++ src/sot-talos-device.cpp 2019-09-17 23:51:50.015282049 +0200 +@@ -13,6 +13,7 @@ + + #include <fstream> + #include <map> ++#include <pinocchio/fwd.hpp> + + #if DEBUG + #define ODEBUG(x) std::cout << x << std::endl +--- src/sot-talos-controller.cpp.orig 2019-03-04 17:58:29.000000000 +0100 ++++ src/sot-talos-controller.cpp 2019-09-17 23:52:26.486976528 +0200 +@@ -11,6 +11,7 @@ + * + */ + ++#include <pinocchio/fwd.hpp> + #include <sot/core/debug.hh> + #include <sot/core/exception-abstract.hh> + #include <dynamic_graph_bridge/ros_init.hh> +--- src/sot-pyrene-controller.cpp.orig 2019-03-04 17:58:29.000000000 +0100 ++++ src/sot-pyrene-controller.cpp 2019-09-17 23:52:53.806747699 +0200 +@@ -10,6 +10,7 @@ + * + */ + ++#include <pinocchio/fwd.hpp> + #include <sot/core/debug.hh> + + /* Pyrene is the first TALOS */ -- GitLab