| 1 |
commit: 1dc3765dcf40a74b6ea90b23eeb54cfcb70b0b73 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 14 13:54:53 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 14 13:55:00 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc3765d |
| 7 |
|
| 8 |
dev-ros/settlerlib: fix build with gcc6, bug #594318 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-ros/settlerlib/files/gcc6.patch | 13 +++++++++++++ |
| 13 |
dev-ros/settlerlib/settlerlib-0.10.14.ebuild | 3 ++- |
| 14 |
2 files changed, 15 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ros/settlerlib/files/gcc6.patch b/dev-ros/settlerlib/files/gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..4fe3a03 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/settlerlib/files/gcc6.patch |
| 21 |
@@ -0,0 +1,13 @@ |
| 22 |
+Index: settlerlib/CMakeLists.txt |
| 23 |
+=================================================================== |
| 24 |
+--- settlerlib.orig/CMakeLists.txt |
| 25 |
++++ settlerlib/CMakeLists.txt |
| 26 |
+@@ -9,7 +9,7 @@ catkin_package(DEPENDS Boost calibration |
| 27 |
+ ) |
| 28 |
+ |
| 29 |
+ # common commands for building c++ executables and libraries |
| 30 |
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}) |
| 31 |
++include_directories(${catkin_INCLUDE_DIRS}) |
| 32 |
+ include_directories(include) |
| 33 |
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/settlerlib/ |
| 34 |
+ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} |
| 35 |
|
| 36 |
diff --git a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild |
| 37 |
index e00b304..bb9f246 100644 |
| 38 |
--- a/dev-ros/settlerlib/settlerlib-0.10.14.ebuild |
| 39 |
+++ b/dev-ros/settlerlib/settlerlib-0.10.14.ebuild |
| 40 |
@@ -1,4 +1,4 @@ |
| 41 |
-# Copyright 1999-2014 Gentoo Foundation |
| 42 |
+# Copyright 1999-2016 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
# $Id$ |
| 45 |
|
| 46 |
@@ -22,3 +22,4 @@ RDEPEND=" |
| 47 |
" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
test? ( dev-cpp/gtest )" |
| 50 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |
Archives