diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-09-21 00:22:08 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-09-21 00:22:08 +0000 |
| commit | c08092a825296b4f2d4dfa0b10a6b97cd02154a7 (patch) | |
| tree | fbc24f9d355cc0c0ab304a6f1f7dc265fc39c31a | |
| parent | 604454419c9b141d2ea6302f329e1621e46c8a6f (diff) | |
automatic import of ros-humble-nebula-hesai-commonopeneuler24.03_LTS_SP3
| -rw-r--r-- | nebula-hesai-common.spec | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/nebula-hesai-common.spec b/nebula-hesai-common.spec index f5169c1..fe95165 100644 --- a/nebula-hesai-common.spec +++ b/nebula-hesai-common.spec @@ -19,6 +19,8 @@ BuildRequires: ros-%{ros_distro}-ament-cmake BuildRequires: ros-%{ros_distro}-autoware-cmake BuildRequires: ros-%{ros_distro}-ros-environment BuildRequires: ros-%{ros_distro}-nebula-core-common +BuildRequires: boost-devel +BuildRequires: nlohmann-json-devel BuildRequires: cmake BuildRequires: gcc-c++ @@ -34,22 +36,16 @@ Provides: %{name}-runtime = %{version}-%{release} Nebula Common Hesai Libraries and headers for the Nebula multi-sensor driver framework (ROS 2 %{ros_distro}). -%global srcdir nebula-%{commit} -%global pkgsrcdir %{_builddir}/%{srcdir}/src/nebula_hesai/nebula_hesai_common -%global objdir %{_builddir}/%{srcdir}/.obj_hesai_common - %prep -%setup -q -n %{srcdir} +%autosetup -n %{commit} %build [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH} export PKG_CONFIG_PATH=/opt/ros/%{ros_distro}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} -mkdir -p %{objdir} -cd %{objdir} -%cmake \ - -S %{pkgsrcdir} \ +mkdir -p .obj && cd .obj +%cmake3 \ -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ -DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \ -DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \ @@ -57,19 +53,20 @@ cd %{objdir} -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \ -DSETUPTOOLS_DEB_LAYOUT=OFF \ -DBUILD_TESTING=OFF -DTESTING=OFF \ - -DCMAKE_SUPPRESS_REGENERATION=ON -%make_build + -DCMAKE_SUPPRESS_REGENERATION=ON \ + ../src/nebula_hesai/nebula_hesai_common +make %{?_smp_mflags} %install [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages${PYTHONPATH:+:$PYTHONPATH} -cd %{objdir} +cd .obj %make_install %files /opt/ros/%{ros_distro}/ %changelog -* Sun Sep 20 2026 ROS SIG <ros@openeuler.org> - 1.2.0^20260917git26749c8-1 -- Fix: use commit snapshot tarball and absolute srcdir/objdir paths to match repo layout +* Sun Sep 21 2026 ROS SIG <ros@openeuler.org> - 1.2.0^20260917git26749c8-1 +- Fix: use autosetup -n commit, cmake3, add boost-devel/nlohmann-json-devel to match nebula-core-common build pattern |