diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-10-14 15:59:47 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-10-14 15:59:47 +0200 |
| commit | b7ae1aa5fb650f8113a925327124c581a72723e9 (patch) | |
| tree | 57fcb981e55c32bd37608b0d57c699b1dab08b11 /dev-ros/interval_intersection | |
| parent | dev-ros/settlerlib: remove old (diff) | |
| download | gentoo-b7ae1aa5fb650f8113a925327124c581a72723e9.tar.gz gentoo-b7ae1aa5fb650f8113a925327124c581a72723e9.tar.bz2 gentoo-b7ae1aa5fb650f8113a925327124c581a72723e9.zip | |
dev-ros/interval_intersection: backport upstream fix to build with gcc6, bug #594378, patch by Peter Levine.
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-ros/interval_intersection')
| -rw-r--r-- | dev-ros/interval_intersection/files/gcc6.patch | 31 | ||||
| -rw-r--r-- | dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/dev-ros/interval_intersection/files/gcc6.patch b/dev-ros/interval_intersection/files/gcc6.patch new file mode 100644 index 000000000000..632383629f66 --- /dev/null +++ b/dev-ros/interval_intersection/files/gcc6.patch @@ -0,0 +1,31 @@ +commit c23ddb86367fc43c2d15e08a452ad2dc1a62041b +Author: Hodorgasm <nsane457@gmail.com> +Date: Mon Sep 19 19:11:57 2016 -0400 + + Fix "stdlib.h: No such file or directory" errors in GCC-6 + + Including '-isystem /usr/include' breaks building with GCC-6. + See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 + +diff --git a/interval_intersection/CMakeLists.txt b/interval_intersection/CMakeLists.txt +index 9bfd103..73bc0ac 100644 +--- a/interval_intersection/CMakeLists.txt ++++ b/interval_intersection/CMakeLists.txt +@@ -4,7 +4,7 @@ project(interval_intersection) + find_package(Boost REQUIRED thread) + find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs geometry_msgs rosconsole roscpp roscpp_serialization rostime std_msgs) + +-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}) ++include_directories(${catkin_INCLUDE_DIRS}) + include_directories(include) + + # generate the messages +@@ -35,7 +35,7 @@ add_executable(interval_intersection_node src/interval_intersection_node.cpp) + target_link_libraries(interval_intersection_node ${PROJECT_NAME}) + add_dependencies(interval_intersection_node calibration_msgs_gencpp) + +-include_directories(SYSTEM ${BOOST_INCLUDE_DIRS}) ++include_directories(${BOOST_INCLUDE_DIRS}) + add_executable(interval_intersection_action src/interval_intersection_action.cpp) + target_link_libraries(interval_intersection_action ${Boost_LIBRARIES} + ${catkin_LIBRARIES} diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild index 273edb7e86b3..c6766d0d86d7 100644 --- a/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild +++ b/dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,3 +28,4 @@ RDEPEND=" " DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" +PATCHES=( "${FILESDIR}/gcc6.patch" ) |