summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-10-07 13:50:48 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-10-07 13:50:48 +0200
commit7a248874093015abaf34f4845a583797f80f8002 (patch)
tree7f4033ddd3110c67fcd74b6c74f4d5404559e922 /dev-util/catkin/files
parentdev-util/catkin: remove old (diff)
downloadgentoo-7a248874093015abaf34f4845a583797f80f8002.tar.gz
gentoo-7a248874093015abaf34f4845a583797f80f8002.tar.bz2
gentoo-7a248874093015abaf34f4845a583797f80f8002.zip
dev-util/catkin: Add CATKIN_PREFIX_PATH support to _setup_util.py.in.
Patch by Eric Timmons. Bug #586104. Package-Manager: portage-2.3.1
Diffstat (limited to 'dev-util/catkin/files')
-rw-r--r--dev-util/catkin/files/catkin_prefix_path_util_py.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
new file mode 100644
index 00000000000..d97817662e7
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
@@ -0,0 +1,16 @@
+Author: Eric Timmons
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
+===================================================================
+--- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.6.16/cmake/templates/_setup_util.py.in
+@@ -262,7 +262,7 @@
+ sys.exit(1)
+
+ # environment at generation time
+- CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++ CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+ # prepend current workspace if not already part of CPP
+ base_path = os.path.dirname(__file__)
+ if base_path not in CMAKE_PREFIX_PATH: