diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-06-04 15:07:10 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-06-04 15:08:02 +0200 |
| commit | 022f150b8d86abac12c77f73ac86e88b3d813f36 (patch) | |
| tree | b0c856bd95ea640c1d37804891753994a6d7ec91 | |
| parent | dev-python/pygtk: Drop 2.24.0-r4 (diff) | |
| download | gentoo-022f150b.tar.gz gentoo-022f150b.tar.bz2 gentoo-022f150b.zip | |
dev-util/catkin: fix python script install.
Closes: https://bugs.gentoo.org/726414
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
| -rw-r--r-- | dev-util/catkin/catkin-0.8.3-r1.ebuild (renamed from dev-util/catkin/catkin-0.8.3.ebuild) | 1 | ||||
| -rw-r--r-- | dev-util/catkin/catkin-9999.ebuild | 1 | ||||
| -rw-r--r-- | dev-util/catkin/files/distutils-v2.patch | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/dev-util/catkin/catkin-0.8.3.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild index c37940ea8dfe..adf1b136a8c7 100644 --- a/dev-util/catkin/catkin-0.8.3.ebuild +++ b/dev-util/catkin/catkin-0.8.3-r1.ebuild @@ -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" diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index c37940ea8dfe..adf1b136a8c7 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -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" diff --git a/dev-util/catkin/files/distutils-v2.patch b/dev-util/catkin/files/distutils-v2.patch new file mode 100644 index 000000000000..cb3aab220b05 --- /dev/null +++ b/dev-util/catkin/files/distutils-v2.patch @@ -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@}" |