| 1 |
commit: 4d893616106d03558c8f403911e33b42ef3b731d |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 25 18:21:20 2019 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 25 18:21:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d893616 |
| 7 |
|
| 8 |
dev-ros/tf: upstream fix for boost 1.70.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/tf/files/boost.patch | 28 ++++++++++++++++++++++++++++ |
| 14 |
dev-ros/tf/tf-1.12.0.ebuild | 3 ++- |
| 15 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..dd926cf0584 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/tf/files/boost.patch |
| 22 |
@@ -0,0 +1,28 @@ |
| 23 |
+From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Maarten de Vries <maarten@××××××.es> |
| 25 |
+Date: Thu, 17 Jan 2019 21:40:28 +0100 |
| 26 |
+Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...) |
| 27 |
+ |
| 28 |
+tf is using signals2, which is not the same library as signals. |
| 29 |
+Additionally, signals2 has always been header only, and header only |
| 30 |
+libraries must not be listed in find_package. |
| 31 |
+ |
| 32 |
+Boost 1.69 removed the old signals library entirely, so the otherwise |
| 33 |
+useless `COMPONENTS signals` actually breaks the build. |
| 34 |
+--- |
| 35 |
+ tf/CMakeLists.txt | 2 +- |
| 36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt |
| 39 |
+index 04dcb4e8..b469f658 100644 |
| 40 |
+--- a/tf/CMakeLists.txt |
| 41 |
++++ b/tf/CMakeLists.txt |
| 42 |
+@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS |
| 43 |
+ std_msgs |
| 44 |
+ tf2_ros |
| 45 |
+ ) |
| 46 |
+-find_package(Boost REQUIRED COMPONENTS thread signals system) |
| 47 |
++find_package(Boost REQUIRED COMPONENTS thread system) |
| 48 |
+ |
| 49 |
+ catkin_python_setup() |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/dev-ros/tf/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild |
| 53 |
index d129d24ee28..201cf57ee6b 100644 |
| 54 |
--- a/dev-ros/tf/tf-1.12.0.ebuild |
| 55 |
+++ b/dev-ros/tf/tf-1.12.0.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2018 Gentoo Foundation |
| 58 |
+# Copyright 1999-2019 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
EAPI=5 |
| 62 |
@@ -36,3 +36,4 @@ DEPEND="${RDEPEND} |
| 63 |
dev-cpp/gtest |
| 64 |
dev-python/nose[${PYTHON_USEDEP}] |
| 65 |
)" |
| 66 |
+PATCHES=( "${FILESDIR}/boost.patch" ) |
Archives