| 1 |
commit: 91d640016d97d0dee3f9d4a28b466b6141d1b9f9 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 16 04:26:18 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 16 04:31:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d64001 |
| 7 |
|
| 8 |
dev-util/catkin: Set PYTHONPATH at configure time so that tests run against the version to install, not the installed one. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-util/catkin/catkin-0.7.5.ebuild | 1 + |
| 13 |
dev-util/catkin/catkin-9999.ebuild | 1 + |
| 14 |
2 files changed, 2 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-util/catkin/catkin-0.7.5.ebuild b/dev-util/catkin/catkin-0.7.5.ebuild |
| 17 |
index 6dda0014e8..206cc51814 100644 |
| 18 |
--- a/dev-util/catkin/catkin-0.7.5.ebuild |
| 19 |
+++ b/dev-util/catkin/catkin-0.7.5.ebuild |
| 20 |
@@ -68,6 +68,7 @@ catkin_src_configure_internal() { |
| 21 |
} |
| 22 |
|
| 23 |
src_configure() { |
| 24 |
+ export PYTHONPATH="${S}/python" |
| 25 |
local mycmakeargs=( |
| 26 |
"$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
| 27 |
"-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
| 28 |
|
| 29 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
| 30 |
index 6dda0014e8..206cc51814 100644 |
| 31 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 32 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
| 33 |
@@ -68,6 +68,7 @@ catkin_src_configure_internal() { |
| 34 |
} |
| 35 |
|
| 36 |
src_configure() { |
| 37 |
+ export PYTHONPATH="${S}/python" |
| 38 |
local mycmakeargs=( |
| 39 |
"$(cmake-utils_use test CATKIN_ENABLE_TESTING)" |
| 40 |
"-DCATKIN_BUILD_BINARY_PACKAGE=ON" |
Archives