diff options
| -rw-r--r-- | mrpt-libbase.spec | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/mrpt-libbase.spec b/mrpt-libbase.spec index 6336746..c8aed62 100644 --- a/mrpt-libbase.spec +++ b/mrpt-libbase.spec @@ -5,7 +5,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 2.15.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Mobile Robot Programming Toolkit (MRPT) libraries (core C++ libraries) License: BSD URL: https://github.com/MRPT/mrpt_ros/tree/main @@ -41,12 +41,13 @@ 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 +# %build 中: cd mrpt_libbase && cd .obj，所以 CMAKE_BINARY_DIR = <builddir>/mrpt_libbase/.obj +# SOURCE_DIR 正确路径: ${CMAKE_BINARY_DIR}/../mrpt-build/src/mrpt +# = <builddir>/mrpt_libbase/mrpt-build/src/mrpt ✓ mkdir -p mrpt_libbase/mrpt-build/src/mrpt tar -xzf %{SOURCE1} --strip-components=1 -C mrpt_libbase/mrpt-build/src/mrpt -# 写版本缓存文件（CMake 读 ${CMAKE_BINARY_DIR}/../mrpt_libbase/mrpt-build/MRPT_VERSION_TO_DOWNLOAD.txt） +# 写版本缓存文件（CMake 读 ${CMAKE_BINARY_DIR}/../mrpt-build/MRPT_VERSION_TO_DOWNLOAD.txt） echo -n "%{mrpt_version}" > mrpt_libbase/mrpt-build/MRPT_VERSION_TO_DOWNLOAD.txt # patch CMakeLists.txt：将整个 if/else/endif 块替换为直接使用 SOURCE_DIR，彻底跳过 git clone @@ -54,20 +55,14 @@ 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 -) +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/ -)''' + replacement = 'set(src_cmds\n SOURCE_DIR \${CMAKE_BINARY_DIR}/../mrpt-build/src/mrpt/\n)' 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) + print('pattern not found', file=sys.stderr) sys.exit(1) " @@ -99,6 +94,10 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Mon Sep 21 2026 ai-importer <ai-importer@openeuler.org> - 2.15.21-4 +- Fix SOURCE_DIR path: CMAKE_BINARY_DIR is mrpt_libbase/.obj, so correct relative path + is ../mrpt-build/src/mrpt (not ../mrpt_libbase/mrpt-build/src/mrpt which added extra layer) + * 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 |