Remove patches that assume that PYTHON_INSTALL_DIR is an absolute path

RoboStack · Dec 18, 2024 · 164a49d · 164a49d
1 parent 7bb5dfb
commit 164a49d
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 193 deletions.
diff --git a/patch/ros-humble-rosidl-generator-c.patch b/patch/ros-humble-rosidl-generator-c.patch
diff --git a/patch/ros-humble-rosidl-generator-cpp.patch b/patch/ros-humble-rosidl-generator-cpp.patch
diff --git a/patch/ros-humble-rosidl-generator-dds-idl.patch b/patch/ros-humble-rosidl-generator-dds-idl.patch
diff --git a/patch/ros-humble-rosidl-generator-py.patch b/patch/ros-humble-rosidl-generator-py.patch
@@ -132,6 +132,7 @@ index a6d8263..f231ea2 100644
 -endif()
 +endif()
 \ No newline at end of file
+<<<<<<< HEAD
 diff --git a/rosidl_generator_py-extras.cmake.in b/rosidl_generator_py-extras.cmake.in
 index 80bed29..ba70acc 100644
 --- a/rosidl_generator_py-extras.cmake.in
@@ -144,3 +145,5 @@ index 80bed29..ba70acc 100644
 +  "@PYTHON_INSTALL_DIR@/rosidl_generator_py/__init__.py;@PYTHON_INSTALL_DIR@/rosidl_generator_py/generate_py_impl.py"
    "${rosidl_generator_py_DIR}/../resource"
  )
+=======
+>>>>>>> 63c1c4f (Remove patches that assume that PYTHON_INSTALL_DIR is an absolute path)
diff --git a/patch/ros-humble-rosidl-typesupport-c.patch b/patch/ros-humble-rosidl-typesupport-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-connext-c.patch b/patch/ros-humble-rosidl-typesupport-connext-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-connext-cpp.patch b/patch/ros-humble-rosidl-typesupport-connext-cpp.patch
diff --git a/patch/ros-humble-rosidl-typesupport-cpp.patch b/patch/ros-humble-rosidl-typesupport-cpp.patch
diff --git a/patch/ros-humble-rosidl-typesupport-fastrtps-c.patch b/patch/ros-humble-rosidl-typesupport-fastrtps-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-fastrtps-cpp.patch b/patch/ros-humble-rosidl-typesupport-fastrtps-cpp.patch
diff --git a/patch/ros-humble-rosidl-typesupport-gurumdds-c.patch b/patch/ros-humble-rosidl-typesupport-gurumdds-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-gurumdds-cpp.patch b/patch/ros-humble-rosidl-typesupport-gurumdds-cpp.patch
diff --git a/patch/ros-humble-rosidl-typesupport-introspection-c.patch b/patch/ros-humble-rosidl-typesupport-introspection-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-introspection-cpp.patch b/patch/ros-humble-rosidl-typesupport-introspection-cpp.patch
diff --git a/patch/ros-humble-rosidl-typesupport-opensplice-c.patch b/patch/ros-humble-rosidl-typesupport-opensplice-c.patch
diff --git a/patch/ros-humble-rosidl-typesupport-opensplice-cpp.patch b/patch/ros-humble-rosidl-typesupport-opensplice-cpp.patch