Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/interval_intersection/files/, dev-ros/interval_intersection/
Date: Fri, 14 Oct 2016 14:00:21
Message-Id: 1476453587.b7ae1aa5fb650f8113a925327124c581a72723e9.aballier@gentoo
1 commit: b7ae1aa5fb650f8113a925327124c581a72723e9
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 14 13:59:47 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 14 13:59:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ae1aa5
7
8 dev-ros/interval_intersection: backport upstream fix to build with gcc6, bug #594378, patch by Peter Levine.
9
10 Package-Manager: portage-2.3.2
11
12 dev-ros/interval_intersection/files/gcc6.patch | 31 ++++++++++++++++++++++
13 .../interval_intersection-0.10.14.ebuild | 3 ++-
14 2 files changed, 33 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-ros/interval_intersection/files/gcc6.patch b/dev-ros/interval_intersection/files/gcc6.patch
17 new file mode 100644
18 index 00000000..6323836
19 --- /dev/null
20 +++ b/dev-ros/interval_intersection/files/gcc6.patch
21 @@ -0,0 +1,31 @@
22 +commit c23ddb86367fc43c2d15e08a452ad2dc1a62041b
23 +Author: Hodorgasm <nsane457@×××××.com>
24 +Date: Mon Sep 19 19:11:57 2016 -0400
25 +
26 + Fix "stdlib.h: No such file or directory" errors in GCC-6
27 +
28 + Including '-isystem /usr/include' breaks building with GCC-6.
29 + See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
30 +
31 +diff --git a/interval_intersection/CMakeLists.txt b/interval_intersection/CMakeLists.txt
32 +index 9bfd103..73bc0ac 100644
33 +--- a/interval_intersection/CMakeLists.txt
34 ++++ b/interval_intersection/CMakeLists.txt
35 +@@ -4,7 +4,7 @@ project(interval_intersection)
36 + find_package(Boost REQUIRED thread)
37 + find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs geometry_msgs rosconsole roscpp roscpp_serialization rostime std_msgs)
38 +
39 +-include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
40 ++include_directories(${catkin_INCLUDE_DIRS})
41 + include_directories(include)
42 +
43 + # generate the messages
44 +@@ -35,7 +35,7 @@ add_executable(interval_intersection_node src/interval_intersection_node.cpp)
45 + target_link_libraries(interval_intersection_node ${PROJECT_NAME})
46 + add_dependencies(interval_intersection_node calibration_msgs_gencpp)
47 +
48 +-include_directories(SYSTEM ${BOOST_INCLUDE_DIRS})
49 ++include_directories(${BOOST_INCLUDE_DIRS})
50 + add_executable(interval_intersection_action src/interval_intersection_action.cpp)
51 + target_link_libraries(interval_intersection_action ${Boost_LIBRARIES}
52 + ${catkin_LIBRARIES}
53
54 diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
55 index 273edb7..c6766d0 100644
56 --- a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
57 +++ b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
58 @@ -1,4 +1,4 @@
59 -# Copyright 1999-2014 Gentoo Foundation
60 +# Copyright 1999-2016 Gentoo Foundation
61 # Distributed under the terms of the GNU General Public License v2
62 # $Id$
63
64 @@ -28,3 +28,4 @@ RDEPEND="
65 "
66 DEPEND="${RDEPEND}
67 test? ( dev-cpp/gtest )"
68 +PATCHES=( "${FILESDIR}/gcc6.patch" )