diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
| commit | 24fd814c326e282c4321965c31f341dad77e270d (patch) | |
| tree | 033d63b33c21a3209964ab56005bb9bdd523630d /dev-util/catkin/files | |
| parent | 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff) | |
gentoo resync : 08.01.2021
Diffstat (limited to 'dev-util/catkin/files')
| -rw-r--r-- | dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch | 26 |
1 files changed, 13 insertions, 13 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 6ad761f8421a..52f183cc8551 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 @@ -1,24 +1,24 @@ Author: Eric Timmons https://bugs.gentoo.org/show_bug.cgi?id=586104 -Index: catkin-0.7.17/cmake/templates/_setup_util.py.in +Index: catkin-0.8.9/cmake/templates/_setup_util.py.in =================================================================== ---- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in -+++ catkin-0.7.17/cmake/templates/_setup_util.py.in -@@ -264,7 +264,7 @@ if __name__ == '__main__': +--- catkin-0.8.9.orig/cmake/templates/_setup_util.py.in ++++ catkin-0.8.9/cmake/templates/_setup_util.py.in +@@ -268,7 +268,7 @@ if __name__ == '__main__': if not args.local: # 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(';') +- CMAKE_PREFIX_PATH = r'@CMAKE_PREFIX_PATH_AS_IS@'.split(';') ++ CMAKE_PREFIX_PATH = r'@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';') else: # don't consider any other prefix path than this one CMAKE_PREFIX_PATH = [] -Index: catkin-0.7.17/python/catkin/builder.py +Index: catkin-0.8.9/python/catkin/builder.py =================================================================== ---- catkin-0.7.17.orig/python/catkin/builder.py -+++ catkin-0.7.17/python/catkin/builder.py -@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh" +--- catkin-0.8.9.orig/python/catkin/builder.py ++++ catkin-0.8.9/python/catkin/builder.py +@@ -1164,6 +1164,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh" '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)), @@ -26,10 +26,10 @@ Index: catkin-0.7.17/python/catkin/builder.py 'PYTHON_EXECUTABLE': sys.executable, 'PYTHON_INSTALL_DIR': get_python_install_dir(), } -Index: catkin-0.7.17/test/unit_tests/test_setup_util.py +Index: catkin-0.8.9/test/unit_tests/test_setup_util.py =================================================================== ---- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py -+++ catkin-0.7.17/test/unit_tests/test_setup_util.py +--- catkin-0.8.9.orig/test/unit_tests/test_setup_util.py ++++ catkin-0.8.9/test/unit_tests/test_setup_util.py @@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa 'PYTHON_EXECUTABLE': sys.executable, 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages', |