| 1 |
commit: 3bc8f1430d487b57c71bb0129853466b6514afba |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 27 12:30:48 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 27 12:30:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc8f143 |
| 7 |
|
| 8 |
dev-util/catkin: include GNUInstallDirs in all.cmake so that LIBDIR is always defined. Bug #566670. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{catkin-0.6.16-r1.ebuild => catkin-0.6.16-r2.ebuild} | 1 + |
| 14 |
dev-util/catkin/catkin-9999.ebuild | 1 + |
| 15 |
dev-util/catkin/files/gnuinstalldirs.patch | 15 +++++++++++++++ |
| 16 |
3 files changed, 17 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-util/catkin/catkin-0.6.16-r1.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild |
| 19 |
similarity index 98% |
| 20 |
rename from dev-util/catkin/catkin-0.6.16-r1.ebuild |
| 21 |
rename to dev-util/catkin/catkin-0.6.16-r2.ebuild |
| 22 |
index b4904c8..1e11494 100644 |
| 23 |
--- a/dev-util/catkin/catkin-0.6.16-r1.ebuild |
| 24 |
+++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild |
| 25 |
@@ -39,6 +39,7 @@ PATCHES=( |
| 26 |
"${FILESDIR}/tests.patch" |
| 27 |
"${FILESDIR}/distutils.patch" |
| 28 |
"${FILESDIR}/catkin_prefix_path.patch" |
| 29 |
+ "${FILESDIR}/gnuinstalldirs.patch" |
| 30 |
) |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
|
| 34 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
| 35 |
index b4904c8..1e11494 100644 |
| 36 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 37 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
| 38 |
@@ -39,6 +39,7 @@ PATCHES=( |
| 39 |
"${FILESDIR}/tests.patch" |
| 40 |
"${FILESDIR}/distutils.patch" |
| 41 |
"${FILESDIR}/catkin_prefix_path.patch" |
| 42 |
+ "${FILESDIR}/gnuinstalldirs.patch" |
| 43 |
) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
|
| 47 |
diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..795eafc |
| 50 |
--- /dev/null |
| 51 |
+++ b/dev-util/catkin/files/gnuinstalldirs.patch |
| 52 |
@@ -0,0 +1,15 @@ |
| 53 |
+Index: catkin-0.6.16/cmake/all.cmake |
| 54 |
+=================================================================== |
| 55 |
+--- catkin-0.6.16.orig/cmake/all.cmake |
| 56 |
++++ catkin-0.6.16/cmake/all.cmake |
| 57 |
+@@ -108,6 +108,10 @@ endif() |
| 58 |
+ # include CMake functions |
| 59 |
+ include(CMakeParseArguments) |
| 60 |
+ |
| 61 |
++# include GNUInstallDirs for LIBDIR |
| 62 |
++# https://bugs.gentoo.org/show_bug.cgi?id=566670 |
| 63 |
++include(GNUInstallDirs) |
| 64 |
++ |
| 65 |
+ # functions/macros: list_append_unique, safe_execute_process |
| 66 |
+ # python-integration: catkin_python_setup.cmake, interrogate_setup_dot_py.py, templates/__init__.py.in, templates/script.py.in, templates/python_distutils_install.bat.in, templates/python_distutils_install.sh.in, templates/safe_execute_install.cmake.in |
| 67 |
+ foreach(filename |
Archives