diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-07-30 16:57:15 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-07-30 17:02:34 +0200 |
| commit | 7ac50d6aefdbce6975819fed24ba04f2f174a3f2 (patch) | |
| tree | d81ee5fb0bca8289017a9a4aa0f768b54ea58c14 | |
| parent | dev-ros/tf2_geometry_msgs: add missing test deps (diff) | |
| download | gentoo-7ac50d6a.tar.gz gentoo-7ac50d6a.tar.bz2 gentoo-7ac50d6a.zip | |
dev-util/catkin: fix patch for when env is unset
Closes: https://bugs.gentoo.org/629596
Closes: https://bugs.gentoo.org/677628
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
| -rw-r--r-- | dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch index ae468b21c01c..6ad761f8421a 100644 --- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch +++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch @@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), -+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)), ++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)), 'PYTHON_EXECUTABLE': sys.executable, 'PYTHON_INSTALL_DIR': get_python_install_dir(), } |