diff options
author | Alexis Ballier <aballier@gentoo.org> | 2018-08-17 14:53:40 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2018-08-17 15:07:58 +0200 |
commit | 91c14cabfa6fa2e752c81bf35031b7a7433ec5e2 (patch) | |
tree | 1b8dd954033223d9b7096dd884f3e71d085e59dd /dev-python/catkin_pkg/files | |
parent | dev-ros/laser_proc: Remove old (diff) | |
download | gentoo-91c14cabfa6fa2e752c81bf35031b7a7433ec5e2.tar.gz gentoo-91c14cabfa6fa2e752c81bf35031b7a7433ec5e2.tar.bz2 gentoo-91c14cabfa6fa2e752c81bf35031b7a7433ec5e2.zip |
dev-python/catkin_pkg: Remove old
Package-Manager: Portage-2.3.46, Repoman-2.3.10
Diffstat (limited to 'dev-python/catkin_pkg/files')
-rw-r--r-- | dev-python/catkin_pkg/files/catkin_prefix.patch | 28 | ||||
-rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop2.patch | 27 |
2 files changed, 0 insertions, 55 deletions
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch deleted file mode 100644 index fe9cc347882b..000000000000 --- a/dev-python/catkin_pkg/files/catkin_prefix.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.2.8/src/catkin_pkg/workspaces.py -=================================================================== ---- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py -+++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py -@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_ - - def get_spaces(paths=None): - """ -- Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces. -+ Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces. - It resolves the source space for each devel space and ignores non-catkin paths. - :param paths_to_order: list of paths - :param prefix_paths: list of prefixes, must not end with '/' - """ - 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.') -+ 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 [] - - spaces = [] - for path in paths: diff --git a/dev-python/catkin_pkg/files/infinite_loop2.patch b/dev-python/catkin_pkg/files/infinite_loop2.patch deleted file mode 100644 index 7c5edba2b50c..000000000000 --- a/dev-python/catkin_pkg/files/infinite_loop2.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=612860 -By Tim Rakowski -We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node - -Index: catkin_pkg-0.3.6/src/catkin_pkg/packages.py -=================================================================== ---- catkin_pkg-0.3.6.orig/src/catkin_pkg/packages.py -+++ catkin_pkg-0.3.6/src/catkin_pkg/packages.py -@@ -56,7 +56,9 @@ def find_package_paths(basepath, exclude - """ - paths = [] - real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else [] -+ visited = set() - for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True): -+ visited.add(dirpath) - if 'CATKIN_IGNORE' in filenames or \ - os.path.realpath(dirpath) in real_exclude_paths or \ - (exclude_subspaces and '.catkin' in filenames): -@@ -67,7 +69,7 @@ def find_package_paths(basepath, exclude - del dirnames[:] - continue - # filter out hidden directories in-place -- dirnames[:] = [d for d in dirnames if not d.startswith('.')] -+ dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited] - return paths - - |