From 008d1bf0f3319806bc22f82d50ad9e9b5420a159 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 9 Feb 2017 18:07:33 +0100 Subject: dev-util/catkin: Pass PYTHON_INSTALL_DIR to cmake too. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-util/catkin/catkin-0.7.4-r1.ebuild | 8 ++++++-- dev-util/catkin/catkin-9999.ebuild | 8 ++++++-- 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 c98407801d62..6dda0014e8e6 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 c98407801d62..6dda0014e8e6 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 } -- cgit v1.2.3-18-g5258