gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/catkin: fix python script install.

Browse Source 
Closes: https://bugs.gentoo.org/726414
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2020-06-04 15:07:10 +02:00
parent 5bd85f0a6e
commit 022f150b8d
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev-util/catkin/catkin-0.8.3.ebuild → dev-util/catkin/catkin-0.8.3-r1.ebuild
View File

@@ -43,6 +43,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/tests.patch"
"${FILESDIR}/distutils-v2.patch"
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"

1
dev-util/catkin/catkin-9999.ebuild
View File

@@ -43,6 +43,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/tests.patch"
"${FILESDIR}/distutils-v2.patch"
"${FILESDIR}/catkin_prefix_path.patch"
"${FILESDIR}/gnuinstalldirs.patch"
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"

13
dev-util/catkin/files/distutils-v2.patch Normal file
View File

@@ -0,0 +1,13 @@
Allow to install scripts in PYTHON_SCRIPTDIR.
Needed for Gentoo multi-python support.
Index: catkin-0.8.3/cmake/templates/python_distutils_install.sh.in
===================================================================
--- catkin-0.8.3.orig/cmake/templates/python_distutils_install.sh.in
+++ catkin-0.8.3/cmake/templates/python_distutils_install.sh.in
@@ -30,4 +30,4 @@ echo_and_run /usr/bin/env \
build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
install \
--root="${DESTDIR-/}" \
- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
+ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"