1 |
commit: cfc8fa175f286a57d8055de9681f6070e19bd365 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 20 11:20:49 2019 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 20 11:23:16 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc8fa17 |
7 |
|
8 |
dev-ros/test_roscpp: upstream boost fix |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-ros/test_roscpp/files/boost.patch | 26 ++++++++++++++++++++++ |
14 |
...-1.14.3.ebuild => test_roscpp-1.14.3-r1.ebuild} | 3 ++- |
15 |
2 files changed, 28 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-ros/test_roscpp/files/boost.patch b/dev-ros/test_roscpp/files/boost.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..41bac154d6c |
20 |
--- /dev/null |
21 |
+++ b/dev-ros/test_roscpp/files/boost.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+commit 41f18edc9f2f0b1ef304ea25f148bd56a6bf3d70 |
24 |
+Author: Maarten de Vries <maarten@××××××.es> |
25 |
+Date: Thu Jan 31 00:58:29 2019 +0100 |
26 |
+ |
27 |
+ Remove signals from find_package(Boost COMPONENTS ...) (#1580) |
28 |
+ |
29 |
+ The packages use signals2, not signals. Only boost libraries with |
30 |
+ compiled code should be passed to find_package(Boost COMPONENTS ...), |
31 |
+ and the signals2 library has always been header only. |
32 |
+ |
33 |
+ Boost 1.69 has removed the deprecated signals library, so the otherwise |
34 |
+ useless but harmless `signals` component now breaks the build. |
35 |
+ |
36 |
+diff --git a/test/test_roscpp/CMakeLists.txt b/test/test_roscpp/CMakeLists.txt |
37 |
+index 519767362..01c3d6672 100644 |
38 |
+--- a/test/test_roscpp/CMakeLists.txt |
39 |
++++ b/test/test_roscpp/CMakeLists.txt |
40 |
+@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS |
41 |
+ ) |
42 |
+ |
43 |
+ if(CATKIN_ENABLE_TESTING) |
44 |
+- find_package(Boost REQUIRED COMPONENTS signals filesystem system) |
45 |
++ find_package(Boost REQUIRED COMPONENTS filesystem system) |
46 |
+ |
47 |
+ include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) |
48 |
+ |
49 |
|
50 |
diff --git a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild |
51 |
similarity index 89% |
52 |
rename from dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild |
53 |
rename to dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild |
54 |
index 74f15fb4247..8e988cf0c46 100644 |
55 |
--- a/dev-ros/test_roscpp/test_roscpp-1.14.3.ebuild |
56 |
+++ b/dev-ros/test_roscpp/test_roscpp-1.14.3-r1.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2018 Gentoo Foundation |
59 |
+# Copyright 1999-2019 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI=5 |
63 |
@@ -29,3 +29,4 @@ DEPEND="${RDEPEND} |
64 |
) |
65 |
" |
66 |
REQUIRED_USE="test? ( ros_messages_cxx )" |
67 |
+PATCHES=( "${FILESDIR}/boost.patch" ) |