diff options
| -rw-r--r-- | mrpt-libbase.spec | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/mrpt-libbase.spec b/mrpt-libbase.spec index 3358df3..6336746 100644 --- a/mrpt-libbase.spec +++ b/mrpt-libbase.spec @@ -5,7 +5,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 2.15.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mobile Robot Programming Toolkit (MRPT) libraries (core C++ libraries) License: BSD URL: https://github.com/MRPT/mrpt_ros/tree/main @@ -41,14 +41,35 @@ Mobile Robot Programming Toolkit (MRPT) libraries (core C++ libraries). %autosetup -n %{RosPkgName}-%{src_version} # 预置 mrpt 上游源码到 ExternalProject 期望路径，避免构建时 git clone +# CMAKE_BINARY_DIR = mrpt_libbase/.obj，SOURCE_DIR 期望 .obj/../mrpt_libbase/mrpt-build/src/mrpt +mkdir -p mrpt_libbase/.obj mkdir -p mrpt_libbase/mrpt-build/src/mrpt tar -xzf %{SOURCE1} --strip-components=1 -C mrpt_libbase/mrpt-build/src/mrpt -# 写版本缓存文件，让 CMake 认为源码已就绪 +# 写版本缓存文件（CMake 读 ${CMAKE_BINARY_DIR}/../mrpt_libbase/mrpt-build/MRPT_VERSION_TO_DOWNLOAD.txt） echo -n "%{mrpt_version}" > mrpt_libbase/mrpt-build/MRPT_VERSION_TO_DOWNLOAD.txt -# patch CMakeLists.txt：移除 buildfarm 主机名检查，只要 SOURCE_DIR 存在即复用 -sed -i 's/(NOT "$ENV{HOME}" STREQUAL "\/home\/buildfarm") AND //' mrpt_libbase/CMakeLists.txt +# patch CMakeLists.txt：将整个 if/else/endif 块替换为直接使用 SOURCE_DIR，彻底跳过 git clone +python3 -c " +import re, sys +path = 'mrpt_libbase/CMakeLists.txt' +txt = open(path).read() +# 替换从 'if (EXISTS' 到对应 'endif()' 的整个条件块，强制使用本地源码 +old = re.search( + r'if \(EXISTS.*?endif\(\)', + txt, re.DOTALL +) +if old: + replacement = '''set(src_cmds + SOURCE_DIR \${CMAKE_BINARY_DIR}/../mrpt_libbase/mrpt-build/src/mrpt/ +)''' + txt = txt[:old.start()] + replacement + txt[old.end():] + open(path, 'w').write(txt) + print('patch applied') +else: + print('pattern not found, check CMakeLists.txt', file=sys.stderr) + sys.exit(1) +" %build [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true @@ -78,6 +99,10 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Mon Sep 21 2026 ai-importer <ai-importer@openeuler.org> - 2.15.21-3 +- Fix: replace if/else/endif block in CMakeLists.txt with unconditional SOURCE_DIR +- Previous sed patch only removed HOME check but COPR still ran git clone; now bypassed completely + * Mon Sep 21 2026 ai-importer <ai-importer@openeuler.org> - 2.15.21-2 - Bundle mrpt upstream sources as Source1 to avoid offline git clone in COPR - Remove unavailable BuildRequires (freenect/openni/wx/glfw not needed for core libs) |