diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-python/catkin_pkg/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-python/catkin_pkg/files')
-rw-r--r-- | dev-python/catkin_pkg/files/argparse.patch | 12 | ||||
-rw-r--r-- | dev-python/catkin_pkg/files/catkin_prefix.patch | 28 | ||||
-rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop2.patch | 27 | ||||
-rw-r--r-- | dev-python/catkin_pkg/files/ros_packages.patch | 13 |
4 files changed, 80 insertions, 0 deletions
diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch new file mode 100644 index 000000000000..f39df4a40565 --- /dev/null +++ b/dev-python/catkin_pkg/files/argparse.patch @@ -0,0 +1,12 @@ +Index: catkin_pkg-0.3.1/setup.py +=================================================================== +--- catkin_pkg-0.3.1.orig/setup.py ++++ catkin_pkg-0.3.1/setup.py +@@ -31,7 +31,6 @@ kwargs = { + 'long_description': 'Library for retrieving information about catkin packages.', + 'license': 'BSD', + 'install_requires': [ +- 'argparse', + 'docutils', + 'python-dateutil' + ], diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch new file mode 100644 index 000000000000..c5f40db51cd1 --- /dev/null +++ b/dev-python/catkin_pkg/files/catkin_prefix.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000000..7c5edba2b50c --- /dev/null +++ b/dev-python/catkin_pkg/files/infinite_loop2.patch @@ -0,0 +1,27 @@ +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 + + diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch new file mode 100644 index 000000000000..6c9855d627c9 --- /dev/null +++ b/dev-python/catkin_pkg/files/ros_packages.patch @@ -0,0 +1,13 @@ +Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py +=================================================================== +--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py ++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py +@@ -59,7 +59,7 @@ def find_package_paths(basepath, exclude + del dirnames[:] + continue + elif PACKAGE_MANIFEST_FILENAME in filenames: +- paths.append(os.path.relpath(dirpath, basepath)) ++ paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath)) + del dirnames[:] + continue + for dirname in dirnames: |