| 1 |
commit: b33ece56c59ae0b1c186af967c552efaa9dcd361 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 13:55:54 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 15:04:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33ece56 |
| 7 |
|
| 8 |
dev-util/catkin: set global etc destination to /etc, part of bug #598537 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
.../catkin/{catkin-0.7.4.ebuild => catkin-0.7.4-r1.ebuild} | 1 + |
| 13 |
dev-util/catkin/catkin-9999.ebuild | 1 + |
| 14 |
dev-util/catkin/files/etc.patch | 13 +++++++++++++ |
| 15 |
3 files changed, 15 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/catkin/catkin-0.7.4.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild |
| 18 |
similarity index 99% |
| 19 |
rename from dev-util/catkin/catkin-0.7.4.ebuild |
| 20 |
rename to dev-util/catkin/catkin-0.7.4-r1.ebuild |
| 21 |
index ada4a5e..c984078 100644 |
| 22 |
--- a/dev-util/catkin/catkin-0.7.4.ebuild |
| 23 |
+++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild |
| 24 |
@@ -42,6 +42,7 @@ PATCHES=( |
| 25 |
"${FILESDIR}/gnuinstalldirs.patch" |
| 26 |
"${FILESDIR}/catkin_prefix_path_util_py.patch" |
| 27 |
"${FILESDIR}/package_xml.patch" |
| 28 |
+ "${FILESDIR}/etc.patch" |
| 29 |
) |
| 30 |
|
| 31 |
src_prepare() { |
| 32 |
|
| 33 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
| 34 |
index ada4a5e..c984078 100644 |
| 35 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 36 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
| 37 |
@@ -42,6 +42,7 @@ PATCHES=( |
| 38 |
"${FILESDIR}/gnuinstalldirs.patch" |
| 39 |
"${FILESDIR}/catkin_prefix_path_util_py.patch" |
| 40 |
"${FILESDIR}/package_xml.patch" |
| 41 |
+ "${FILESDIR}/etc.patch" |
| 42 |
) |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
|
| 46 |
diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch |
| 47 |
new file mode 100644 |
| 48 |
index 00000000..205aca9 |
| 49 |
--- /dev/null |
| 50 |
+++ b/dev-util/catkin/files/etc.patch |
| 51 |
@@ -0,0 +1,13 @@ |
| 52 |
+Index: catkin-0.7.4/cmake/all.cmake |
| 53 |
+=================================================================== |
| 54 |
+--- catkin-0.7.4.orig/cmake/all.cmake |
| 55 |
++++ catkin-0.7.4/cmake/all.cmake |
| 56 |
+@@ -163,7 +163,7 @@ unset(_CATKIN_CURRENT_PACKAGE) |
| 57 |
+ |
| 58 |
+ # set global install destinations |
| 59 |
+ set(CATKIN_GLOBAL_BIN_DESTINATION bin) |
| 60 |
+-set(CATKIN_GLOBAL_ETC_DESTINATION etc) |
| 61 |
++set(CATKIN_GLOBAL_ETC_DESTINATION ../etc) |
| 62 |
+ set(CATKIN_GLOBAL_INCLUDE_DESTINATION include) |
| 63 |
+ set(CATKIN_GLOBAL_LIB_DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 64 |
+ set(CATKIN_GLOBAL_LIBEXEC_DESTINATION libexec) |
Archives