From 1a3764984f04aeb4831e41a4e3f72efdc8d2940c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Thu, 17 May 2018 06:27:39 +0200 Subject: [PATCH] rostime: use submitted patch for boost 1.67 --- ...boost-microseconds-must-be-integral.patch} | 24 +++++++++++++++++++ recipes-ros/roscpp-core/rostime_0.5.8.bb | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) rename recipes-ros/roscpp-core/files/{0001-remove-implicit-cast.patch => 0001-argument-to-boost-microseconds-must-be-integral.patch} (53%) diff --git a/recipes-ros/roscpp-core/files/0001-remove-implicit-cast.patch b/recipes-ros/roscpp-core/files/0001-argument-to-boost-microseconds-must-be-integral.patch similarity index 53% rename from recipes-ros/roscpp-core/files/0001-remove-implicit-cast.patch rename to recipes-ros/roscpp-core/files/0001-argument-to-boost-microseconds-must-be-integral.patch index f367160..8ff8cf0 100644 --- a/recipes-ros/roscpp-core/files/0001-remove-implicit-cast.patch +++ b/recipes-ros/roscpp-core/files/0001-argument-to-boost-microseconds-must-be-integral.patch @@ -1,3 +1,24 @@ +From e5de3c20eb178683c78e225d00bf0f47c48895a5 Mon Sep 17 00:00:00 2001 +From: Lukas Solanka +Date: Tue, 17 Apr 2018 22:59:48 +0100 +Subject: [PATCH] argument to boost microseconds must be integral + +With Boost >= 1.67 compilation fails because now it requires the +constructor argument to be integral. + +Upstream-Status: Submitted [https://github.com/ros/roscpp_core/pull/79] + +This patch has been generated with: + `git pull https://github.com/lsolanka/roscpp_core.git pr.microseconds-integer && \ + git format-patch -1 e5de3c20eb178683c78e225d00bf0f47c48895a5` +in the roscpp_core repository. + +Signed-off-by: Lukas Bulwahn +--- + rostime/include/ros/impl/duration.h | 2 +- + rostime/include/ros/impl/time.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + diff --git a/rostime/include/ros/impl/duration.h b/rostime/include/ros/impl/duration.h index 2ca2f5b..7ebd202 100644 --- a/rostime/include/ros/impl/duration.h @@ -24,3 +45,6 @@ index ec991e6..61b686c 100644 #endif } +-- +2.7.4 + diff --git a/recipes-ros/roscpp-core/rostime_0.5.8.bb b/recipes-ros/roscpp-core/rostime_0.5.8.bb index 40ad83a..2a61fa5 100644 --- a/recipes-ros/roscpp-core/rostime_0.5.8.bb +++ b/recipes-ros/roscpp-core/rostime_0.5.8.bb @@ -7,4 +7,4 @@ DEPENDS = "boost cpp-common" require roscpp-core.inc -SRC_URI += "file://0001-remove-implicit-cast.patch;striplevel=2" +SRC_URI += "file://0001-argument-to-boost-microseconds-must-be-integral.patch;striplevel=2"