[gentoo-commits] repo/gentoo:master commit in: dev-ros/settlerlib/files/, dev-ros/settlerlib/

[gentoo-commits] repo/gentoo:master commit in: dev-ros/settlerlib/files/, dev-ros/settlerlib/

[Alexis Ballier]

commit:     1dc3765dcf40a74b6ea90b23eeb54cfcb70b0b73
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 13:54:53 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 13:55:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc3765d

dev-ros/settlerlib: fix build with gcc6, bug #594318

Package-Manager: portage-2.3.2

 dev-ros/settlerlib/files/gcc6.patch          | 13 +++++++++++++
 dev-ros/settlerlib/settlerlib-0.10.14.ebuild |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dev-ros/settlerlib/files/gcc6.patch b/dev-ros/settlerlib/files/gcc6.patch
new file mode 100644
index 00000000..4fe3a03
--- /dev/null
+++ b/dev-ros/settlerlib/files/gcc6.patch
@@ -0,0 +1,13 @@
+Index: settlerlib/CMakeLists.txt
+===================================================================
+--- settlerlib.orig/CMakeLists.txt
++++ settlerlib/CMakeLists.txt
+@@ -9,7 +9,7 @@ catkin_package(DEPENDS Boost calibration
+ )
+ 
+ # common commands for building c++ executables and libraries
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
++include_directories(${catkin_INCLUDE_DIRS})
+ include_directories(include)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/settlerlib/
+         DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}

diff --git a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
index e00b304..bb9f246 100644
--- a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild
+++ b/dev-ros/settlerlib/settlerlib-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$
 
@@ -22,3 +22,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/gcc6.patch" )