| 1 |
commit: 902cc5598bd239ce893e02ca2f8d1917de9368ec |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 9 17:19:21 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 9 17:46:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902cc559 |
| 7 |
|
| 8 |
eclass/ros-catkin.eclass: Set PYTHON_INSTALL_DIR when building python packages. |
| 9 |
|
| 10 |
eclass/ros-catkin.eclass | 7 ++++++- |
| 11 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass |
| 14 |
index 61d01429b5..93086aa123 100644 |
| 15 |
--- a/eclass/ros-catkin.eclass |
| 16 |
+++ b/eclass/ros-catkin.eclass |
| 17 |
@@ -157,7 +157,12 @@ ros-catkin_src_prepare() { |
| 18 |
# Internal decoration of cmake-utils_src_configure to handle multiple python installs. |
| 19 |
ros-catkin_src_configure_internal() { |
| 20 |
if [ -n "${CATKIN_DO_PYTHON_MULTIBUILD}" ] ; then |
| 21 |
- local mycmakeargs=("${mycmakeargs[@]}" -DPYTHON_EXECUTABLE="${PYTHON}") |
| 22 |
+ local sitedir="$(python_get_sitedir)" |
| 23 |
+ local mycmakeargs=( |
| 24 |
+ "${mycmakeargs[@]}" |
| 25 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
| 26 |
+ -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" |
| 27 |
+ ) |
| 28 |
python_export PYTHON_SCRIPTDIR |
| 29 |
fi |
| 30 |
cmake-utils_src_configure "${@}" |
Archives