diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2017-02-20 14:29:11 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2017-02-20 16:21:44 +0100 |
| commit | 821daa8dbc905b18731825210ef7c0b5e9a9254f (patch) | |
| tree | 7aae0a549ee5a655eec1053a8288af8293a73442 /dev-ros | |
| parent | dev-ros/test_nodelet: remove old (diff) | |
| download | gentoo-821daa8dbc905b18731825210ef7c0b5e9a9254f.tar.gz gentoo-821daa8dbc905b18731825210ef7c0b5e9a9254f.tar.bz2 gentoo-821daa8dbc905b18731825210ef7c0b5e9a9254f.zip | |
dev-ros/test_nodelet: Fix build with gcc6.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/test_nodelet/files/gcc6.patch | 13 | ||||
| -rw-r--r-- | dev-ros/test_nodelet/test_nodelet-1.9.9.ebuild | 1 | ||||
| -rw-r--r-- | dev-ros/test_nodelet/test_nodelet-9999.ebuild | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/dev-ros/test_nodelet/files/gcc6.patch b/dev-ros/test_nodelet/files/gcc6.patch new file mode 100644 index 000000000000..102fe01879d6 --- /dev/null +++ b/dev-ros/test_nodelet/files/gcc6.patch @@ -0,0 +1,13 @@ +Index: test_nodelet/CMakeLists.txt +=================================================================== +--- test_nodelet.orig/CMakeLists.txt ++++ test_nodelet/CMakeLists.txt +@@ -8,7 +8,7 @@ catkin_package() + if(CATKIN_ENABLE_TESTING) + find_package(Boost REQUIRED thread) + find_package(catkin REQUIRED nodelet pluginlib rostest) +- include_directories(SYSTEM ${BOOST_INCLUDE_DIRS} ++ include_directories(${BOOST_INCLUDE_DIRS} + ${catkin_INCLUDE_DIRS} + ) + diff --git a/dev-ros/test_nodelet/test_nodelet-1.9.9.ebuild b/dev-ros/test_nodelet/test_nodelet-1.9.9.ebuild index 547c1b84034e..dbc34918a136 100644 --- a/dev-ros/test_nodelet/test_nodelet-1.9.9.ebuild +++ b/dev-ros/test_nodelet/test_nodelet-1.9.9.ebuild @@ -26,3 +26,4 @@ DEPEND="${RDEPEND} dev-ros/rosbash ) " +PATCHES=( "${FILESDIR}/gcc6.patch" ) diff --git a/dev-ros/test_nodelet/test_nodelet-9999.ebuild b/dev-ros/test_nodelet/test_nodelet-9999.ebuild index 4de9404655c0..dbc34918a136 100644 --- a/dev-ros/test_nodelet/test_nodelet-9999.ebuild +++ b/dev-ros/test_nodelet/test_nodelet-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,3 +26,4 @@ DEPEND="${RDEPEND} dev-ros/rosbash ) " +PATCHES=( "${FILESDIR}/gcc6.patch" ) |