commit: 04db859ba4e4f6202a5a5326edc9b59d42894574
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 16:55:02 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 13:47:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04db859b
dev-python/catkin_pkg: improve catkin prefix patch not to require cmake
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../{catkin_pkg-0.4.22.ebuild => catkin_pkg-0.4.22-r1.ebuild} | 0
dev-python/catkin_pkg/files/catkin_prefix2.patch | 11 ++++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
b/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
similarity index 100%
rename from dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
rename to dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
diff --git a/dev-python/catkin_pkg/files/catkin_prefix2.patch
b/dev-python/catkin_pkg/files/catkin_prefix2.patch
index 761894e83b1..064ad1ca65f 100644
--- a/dev-python/catkin_pkg/files/catkin_prefix2.patch
+++ b/dev-python/catkin_pkg/files/catkin_prefix2.patch
@@ -2,10 +2,10 @@ Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
but we need to find packages in SYSROOT.
-Index: catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
+Index: catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
===================================================================
---- catkin_pkg-0.4.6.orig/src/catkin_pkg/workspaces.py
-+++ catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
+--- catkin_pkg-0.4.22.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
@@ -41,16 +41,17 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
def get_spaces(paths=None):
@@ -20,10 +20,11 @@ Index: catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
if paths is None:
- if 'CMAKE_PREFIX_PATH' not in os.environ:
- raise RuntimeError('Neither the environment variable
CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
+- paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if
os.environ['CMAKE_PREFIX_PATH'] else []
+ if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not
in os.environ:
+ raise RuntimeError('None of the environment variables
CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths
passed.')
- paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if
os.environ['CMAKE_PREFIX_PATH'] else []
-+ paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if
os.environ['CATKIN_PREFIX_PATH'] else []
++ paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if
os.environ.get('CMAKE_PREFIX_PATH') else []
++ paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if
os.environ.get('CATKIN_PREFIX_PATH') else []
spaces = []
for path in paths:
