summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-02-09 18:07:33 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-02-09 18:46:01 +0100
commit008d1bf0f3319806bc22f82d50ad9e9b5420a159 (patch)
tree9d52ec8f32338b5d81a39ba0c1db2416db215fa8 /dev-util/catkin
parentdev-util/catkin: remove old (diff)
downloadgentoo-008d1bf0f3319806bc22f82d50ad9e9b5420a159.tar.gz
gentoo-008d1bf0f3319806bc22f82d50ad9e9b5420a159.tar.bz2
gentoo-008d1bf0f3319806bc22f82d50ad9e9b5420a159.zip
dev-util/catkin: Pass PYTHON_INSTALL_DIR to cmake too.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-util/catkin')
-rw-r--r--dev-util/catkin/catkin-0.7.4-r1.ebuild8
-rw-r--r--dev-util/catkin/catkin-9999.ebuild8
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-util/catkin/catkin-0.7.4-r1.ebuild b/dev-util/catkin/catkin-0.7.4-r1.ebuild
index c98407801d6..6dda0014e8e 100644
--- a/dev-util/catkin/catkin-0.7.4-r1.ebuild
+++ b/dev-util/catkin/catkin-0.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -58,7 +58,11 @@ src_prepare() {
}
catkin_src_configure_internal() {
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+ local sitedir="$(python_get_sitedir)"
+ mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+ )
python_export PYTHON_SCRIPTDIR
cmake-utils_src_configure
}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index c98407801d6..6dda0014e8e 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -58,7 +58,11 @@ src_prepare() {
}
catkin_src_configure_internal() {
- mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+ local sitedir="$(python_get_sitedir)"
+ mycmakeargs+=(
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+ )
python_export PYTHON_SCRIPTDIR
cmake-utils_src_configure
}