diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-09-24 03:56:34 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-09-24 03:56:34 +0000 |
| commit | b77fc25684d8dca1eb49b66ef4e50287ed002637 (patch) | |
| tree | 85d11f3fbefc092ba5c832b4a9af340f79133b41 /ecl-threads.spec | |
| parent | 441b110980ae02be11e6b2bd4656f60ff00cf8a8 (diff) | |
automatic import of ros-humble-ecl-threadsopeneuler24.03_LTS_SP3
Diffstat (limited to 'ecl-threads.spec')
| -rw-r--r-- | ecl-threads.spec | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/ecl-threads.spec b/ecl-threads.spec index 3b0aeb8..c0cce7d 100644 --- a/ecl-threads.spec +++ b/ecl-threads.spec @@ -4,7 +4,7 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: This package provides the c++ extensions for a variety of threaded programming License: BSD URL: https://github.com/stonier/ecl_core/tree/release/1.2.x @@ -24,7 +24,7 @@ BuildRequires: ros-%{ros_distro}-ecl-concepts BuildRequires: ros-%{ros_distro}-ecl-config BuildRequires: ros-%{ros_distro}-ecl-errors BuildRequires: ros-%{ros_distro}-ecl-exceptions -BuildRequires: ros-%{ros_distro}-ecl-time +BuildRequires: ros-%{ros_distro}-ecl-time-lite BuildRequires: ros-%{ros_distro}-ecl-utilities Requires: ros-%{ros_distro}-ros-workspace @@ -41,6 +41,7 @@ Requires: ros-%{ros_distro}-ecl-utilities Provides: %{name}-devel = %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} Provides: %{name}-runtime = %{version}-%{release} +Provides: ecl_build %description This package provides the c++ extensions for a variety of threaded @@ -55,7 +56,10 @@ This package provides the c++ extensions for a variety of threaded [ -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} -cd ecl_threads + +_ECL_TIME_STAGE=%{_builddir}/ecl_time_stage + +cd ecl_time mkdir -p .obj && cd .obj %cmake3 \ -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ @@ -66,6 +70,20 @@ mkdir -p .obj && cd .obj -DBUILD_TESTING=OFF -DTESTING=OFF -DCMAKE_SUPPRESS_REGENERATION=ON \ .. make %{?_smp_mflags} +make install DESTDIR=$_ECL_TIME_STAGE + +export LD_LIBRARY_PATH="$_ECL_TIME_STAGE/opt/ros/%{ros_distro}/lib:${LD_LIBRARY_PATH}" +cd ../../ecl_threads +mkdir -p .obj && cd .obj +%cmake3 \ + -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ + -DAMENT_PREFIX_PATH="$_ECL_TIME_STAGE/opt/ros/%{ros_distro};/opt/ros/%{ros_distro}" \ + -DCMAKE_PREFIX_PATH="$_ECL_TIME_STAGE/opt/ros/%{ros_distro};/opt/ros/%{ros_distro}" \ + -UINCLUDE_INSTALL_DIR -ULIB_INSTALL_DIR -USYSCONF_INSTALL_DIR -USHARE_INSTALL_PREFIX -ULIB_SUFFIX \ + -DSETUPTOOLS_DEB_LAYOUT=OFF \ + -DBUILD_TESTING=OFF -DTESTING=OFF -DCMAKE_SUPPRESS_REGENERATION=ON \ + .. +make %{?_smp_mflags} %install [ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true @@ -79,5 +97,9 @@ make install DESTDIR=%{buildroot} /opt/ros/%{ros_distro} %changelog +* Thu Sep 24 2026 ai-importer <ai-importer@openeuler.org> - 1.2.1-2 +- Build ecl_time from source to work around broken ecl_build dep in additional repo +- Add Provides: ecl_build for ros-humble-ecl-time runtime dependency + * Thu Sep 24 2026 ai-importer <ai-importer@openeuler.org> - 1.2.1-1 - Initial import (ROS batch) |