From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 14 Oct 2016 13:52:29 +0000 (+0200)
Subject: dev-ros/test_diagnostic_aggregator: fix build with gcc6, bug #594192
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=64d31fdfd7b6ee7958478876aeadec300e25980c;p=gentoo.git

dev-ros/test_diagnostic_aggregator: fix build with gcc6, bug #594192

Package-Manager: portage-2.3.2
---

diff --git a/dev-ros/test_diagnostic_aggregator/files/gcc6.patch b/dev-ros/test_diagnostic_aggregator/files/gcc6.patch
new file mode 100644
index 000000000000..2819decf3a76
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/files/gcc6.patch
@@ -0,0 +1,13 @@
+Index: test_diagnostic_aggregator/CMakeLists.txt
+===================================================================
+--- test_diagnostic_aggregator.orig/CMakeLists.txt
++++ test_diagnostic_aggregator/CMakeLists.txt
+@@ -9,7 +9,7 @@ catkin_package(DEPENDS diagnostic_aggreg
+                LIBRARIES ${PROJECT_NAME}
+ )
+ 
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
++include_directories(${catkin_INCLUDE_DIRS})
+ include_directories(include)
+ 
+ add_library(test_diagnostic_aggregator
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
index 79de6b78377a..a8d941f87b4c 100644
--- a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild
@@ -23,3 +23,4 @@ RDEPEND="
 	dev-ros/rostest
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )