| 1 |
commit: 022f150b8d86abac12c77f73ac86e88b3d813f36 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 4 13:07:10 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 4 13:08:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022f150b |
| 7 |
|
| 8 |
dev-util/catkin: fix python script install. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/726414 |
| 11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 13 |
|
| 14 |
.../catkin/{catkin-0.8.3.ebuild => catkin-0.8.3-r1.ebuild} | 1 + |
| 15 |
dev-util/catkin/catkin-9999.ebuild | 1 + |
| 16 |
dev-util/catkin/files/distutils-v2.patch | 13 +++++++++++++ |
| 17 |
3 files changed, 15 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-util/catkin/catkin-0.8.3.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild |
| 20 |
similarity index 98% |
| 21 |
rename from dev-util/catkin/catkin-0.8.3.ebuild |
| 22 |
rename to dev-util/catkin/catkin-0.8.3-r1.ebuild |
| 23 |
index c37940ea8df..adf1b136a8c 100644 |
| 24 |
--- a/dev-util/catkin/catkin-0.8.3.ebuild |
| 25 |
+++ b/dev-util/catkin/catkin-0.8.3-r1.ebuild |
| 26 |
@@ -43,6 +43,7 @@ BDEPEND=" |
| 27 |
|
| 28 |
PATCHES=( |
| 29 |
"${FILESDIR}/tests.patch" |
| 30 |
+ "${FILESDIR}/distutils-v2.patch" |
| 31 |
"${FILESDIR}/catkin_prefix_path.patch" |
| 32 |
"${FILESDIR}/gnuinstalldirs.patch" |
| 33 |
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
| 34 |
|
| 35 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
| 36 |
index c37940ea8df..adf1b136a8c 100644 |
| 37 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 38 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
| 39 |
@@ -43,6 +43,7 @@ BDEPEND=" |
| 40 |
|
| 41 |
PATCHES=( |
| 42 |
"${FILESDIR}/tests.patch" |
| 43 |
+ "${FILESDIR}/distutils-v2.patch" |
| 44 |
"${FILESDIR}/catkin_prefix_path.patch" |
| 45 |
"${FILESDIR}/gnuinstalldirs.patch" |
| 46 |
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
| 47 |
|
| 48 |
diff --git a/dev-util/catkin/files/distutils-v2.patch b/dev-util/catkin/files/distutils-v2.patch |
| 49 |
new file mode 100644 |
| 50 |
index 00000000000..cb3aab220b0 |
| 51 |
--- /dev/null |
| 52 |
+++ b/dev-util/catkin/files/distutils-v2.patch |
| 53 |
@@ -0,0 +1,13 @@ |
| 54 |
+Allow to install scripts in PYTHON_SCRIPTDIR. |
| 55 |
+Needed for Gentoo multi-python support. |
| 56 |
+ |
| 57 |
+Index: catkin-0.8.3/cmake/templates/python_distutils_install.sh.in |
| 58 |
+=================================================================== |
| 59 |
+--- catkin-0.8.3.orig/cmake/templates/python_distutils_install.sh.in |
| 60 |
++++ catkin-0.8.3/cmake/templates/python_distutils_install.sh.in |
| 61 |
+@@ -30,4 +30,4 @@ echo_and_run /usr/bin/env \ |
| 62 |
+ build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ |
| 63 |
+ install \ |
| 64 |
+ --root="${DESTDIR-/}" \ |
| 65 |
+- @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@" |
| 66 |
++ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" |
Archives