summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-10-14 15:52:29 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-10-14 15:52:36 +0200
commit64d31fdfd7b6ee7958478876aeadec300e25980c (patch)
treec71acb3e00bc033922a4c80b5dcdfa6ea7f43b19
parentdev-ros/test_diagnostic_aggregator: remove old (diff)
downloadgentoo-64d31fdfd7b6ee7958478876aeadec300e25980c.tar.gz
gentoo-64d31fdfd7b6ee7958478876aeadec300e25980c.tar.bz2
gentoo-64d31fdfd7b6ee7958478876aeadec300e25980c.zip
dev-ros/test_diagnostic_aggregator: fix build with gcc6, bug #594192
Package-Manager: portage-2.3.2
-rw-r--r--dev-ros/test_diagnostic_aggregator/files/gcc6.patch13
-rw-r--r--dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.10.ebuild1
2 files changed, 14 insertions, 0 deletions
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" )