commit:     6d4d943f8d65590ceaecc0f706b08f70bc59231b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 09:20:33 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 09:34:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4d943f

dev-ros/laser_cb_detector: Fix build with gcc6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ros/laser_cb_detector/files/gcc6.patch                 | 13 +++++++++++++
 dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild |  3 ++-
 dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild    |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch 
b/dev-ros/laser_cb_detector/files/gcc6.patch
new file mode 100644
index 00000000..6580ca5
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/gcc6.patch
@@ -0,0 +1,13 @@
+Index: laser_cb_detector/CMakeLists.txt
+===================================================================
+--- laser_cb_detector.orig/CMakeLists.txt
++++ laser_cb_detector/CMakeLists.txt
+@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl
+ )
+ 
+ find_package(OpenCV REQUIRED)
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
++include_directories(${catkin_INCLUDE_DIRS}
+                            ${OpenCV_INCLUDE_DIRS}
+ )
+ include_directories(include)

diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild 
b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 6cecd27..ccd9c34 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.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$
 
@@ -27,3 +27,4 @@ RDEPEND="
        dev-ros/settlerlib
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )

diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild 
b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 6cecd27..ccd9c34 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-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$
 
@@ -27,3 +27,4 @@ RDEPEND="
        dev-ros/settlerlib
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )

Reply via email to