1 |
commit: 004e8fa560114aebec58d0d60234644aa5c7fda5 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 6 16:11:58 2018 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 19:23:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004e8fa5 |
7 |
|
8 |
dev-ros/ros_environment: Still honour CMAKE_PREFIX_PATH for ROS standard methods. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/624924 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
dev-ros/ros_environment/files/catkinprefixpath.patch | 19 +++++++++++++------ |
14 |
...t-1.2.0.ebuild => ros_environment-1.2.0-r1.ebuild} | 0 |
15 |
2 files changed, 13 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/dev-ros/ros_environment/files/catkinprefixpath.patch b/dev-ros/ros_environment/files/catkinprefixpath.patch |
18 |
index ba78a70c2a4..67f16ec9348 100644 |
19 |
--- a/dev-ros/ros_environment/files/catkinprefixpath.patch |
20 |
+++ b/dev-ros/ros_environment/files/catkinprefixpath.patch |
21 |
@@ -1,13 +1,20 @@ |
22 |
-Index: ros_environment-9999/env-hooks/1.ros_package_path.sh.em |
23 |
+Support CATKIN_PREFIX_PATH; let CMAKE_PREFIX_PATH come first, so that standard ROS methods still work even if we do not |
24 |
+use them. |
25 |
+ |
26 |
+Index: ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em |
27 |
=================================================================== |
28 |
---- ros_environment-9999.orig/env-hooks/1.ros_package_path.sh.em |
29 |
-+++ ros_environment-9999/env-hooks/1.ros_package_path.sh.em |
30 |
-@@ -4,7 +4,7 @@ |
31 |
+--- ros_environment-1.2.0.orig/env-hooks/1.ros_package_path.sh.em |
32 |
++++ ros_environment-1.2.0/env-hooks/1.ros_package_path.sh.em |
33 |
+@@ -4,8 +4,10 @@ |
34 |
PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF |
35 |
from __future__ import print_function |
36 |
import os |
37 |
-env_name = 'CMAKE_PREFIX_PATH' |
38 |
-+env_name = 'CATKIN_PREFIX_PATH' |
39 |
- paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else [] |
40 |
+-paths = [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else [] |
41 |
++env_names = [ 'CMAKE_PREFIX_PATH', 'CATKIN_PREFIX_PATH' ] |
42 |
++paths = [] |
43 |
++for env_name in env_names: |
44 |
++ paths += [path for path in os.environ[env_name].split(os.pathsep)] if env_name in os.environ and os.environ[env_name] != '' else [] |
45 |
workspaces = [path for path in paths if os.path.exists(os.path.join(path, '.catkin'))] |
46 |
paths = [] |
47 |
+ for workspace in workspaces: |
48 |
|
49 |
diff --git a/dev-ros/ros_environment/ros_environment-1.2.0.ebuild b/dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild |
50 |
similarity index 100% |
51 |
rename from dev-ros/ros_environment/ros_environment-1.2.0.ebuild |
52 |
rename to dev-ros/ros_environment/ros_environment-1.2.0-r1.ebuild |