diff options
| -rw-r--r-- | ros-humble-rtabmap-sync-0.22.1-fix-cmake-paths.patch | 32 | ||||
| -rw-r--r-- | rtabmap-sync.spec | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/ros-humble-rtabmap-sync-0.22.1-fix-cmake-paths.patch b/ros-humble-rtabmap-sync-0.22.1-fix-cmake-paths.patch new file mode 100644 index 0000000..4d2359b --- /dev/null +++ b/ros-humble-rtabmap-sync-0.22.1-fix-cmake-paths.patch @@ -0,0 +1,32 @@ +diff -Naur rtabmap-sync-0.22.1_orig/CMakeLists.txt rtabmap-sync-0.22.1/CMakeLists.txt +--- rtabmap-sync-0.22.1_orig/CMakeLists.txt 2024-01-01 00:00:00.000000000 +0800 ++++ rtabmap-sync-0.22.1/CMakeLists.txt 2024-01-01 00:00:00.000000000 +0800 +@@ -3,16 +3,18 @@ + + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + # issues #1285 #1288 +- find_library( +- builtin_interfaces__rosidl_generator_c_LIB NAMES builtin_interfaces__rosidl_generator_c +- PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED +- ) +- find_library( +- crypto_LIB NAMES crypto +- PATHS "/usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED +- ) ++ # Note: Modified for openEuler - commented out hardcoded find_library paths ++ # The default CMake find_library mechanism works correctly on openEuler ++ # find_library( ++ # builtin_interfaces__rosidl_generator_c_LIB NAMES builtin_interfaces__rosidl_generator_c ++ # PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" ++ # NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED ++ # ) ++ # find_library( ++ # crypto_LIB NAMES crypto ++ # PATHS "/usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" ++ # NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED ++ # ) + endif() + + find_package(cv_bridge REQUIRED) diff --git a/rtabmap-sync.spec b/rtabmap-sync.spec index b62291c..61b2491 100644 --- a/rtabmap-sync.spec +++ b/rtabmap-sync.spec @@ -16,6 +16,7 @@ Summary: RTAB-Map's synchronization package. License: BSD Source0: %{RosPkgName}-%{version}.tar.gz +Patch0: ros-humble-rtabmap-sync-0.22.1-fix-cmake-paths.patch Requires: ros-%{ros_distro}-cv-bridge Requires: ros-%{ros_distro}-image-transport @@ -54,7 +55,7 @@ Provides: %{name}-runtime = %{version}-%{release} RTAB-Map's synchronization package. %prep -%autosetup -c -n %{name}-%{version} +%autosetup -c -n %{name}-%{version} -p1 %build # Needed to bootstrap since the ros_workspace package does not yet exist. |