dev-util/catkin: include GNUInstallDirs in all.cmake so that LIBDIR i…

…s always defined. Bug #566670. Package-Manager: portage-2.2.26 Signed-off-by: Alexis Ballier <[email protected]>
johu · Nov 27, 2015 · 3bc8f14 · 3bc8f14
1 parent ad0a006
commit 3bc8f14
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/dev-util/catkin/catkin-0.6.16-r1.ebuild → dev-util/catkin/catkin-0.6.16-r2.ebuild b/dev-util/catkin/catkin-0.6.16-r1.ebuild → dev-util/catkin/catkin-0.6.16-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/tests.patch"
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/tests.patch"
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/files/gnuinstalldirs.patch b/dev-util/catkin/files/gnuinstalldirs.patch
@@ -0,0 +1,15 @@
+Index: catkin-0.6.16/cmake/all.cmake
+===================================================================
+--- catkin-0.6.16.orig/cmake/all.cmake
++++ catkin-0.6.16/cmake/all.cmake
+@@ -108,6 +108,10 @@ endif()
+ # include CMake functions
+ include(CMakeParseArguments)
+
++# include GNUInstallDirs for LIBDIR
++# https://bugs.gentoo.org/show_bug.cgi?id=566670
++include(GNUInstallDirs)
++
+ # functions/macros: list_append_unique, safe_execute_process
+ # 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
+ foreach(filename