diff options
author | CoprDistGit <infra@openeuler.org> | 2025-03-08 17:57:33 +0000 |
---|---|---|
committer | CoprDistGit <infra@openeuler.org> | 2025-03-08 17:57:33 +0000 |
commit | 4bb51fa6ca15f5477a9dda5d03d8e4e99b4e075a (patch) | |
tree | eebdcbe24b9ec4feeb26e3033eba5acb117ab28a | |
parent | 6654605640464a39c0021f4686f912c4050c0d99 (diff) |
automatic import of ros-humble-zstd-vendoropeneuler24.03_LTS
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | 0-zstd-vendor-change-cmake-download.patch | 47 | ||||
-rw-r--r-- | sources | 1 | ||||
-rw-r--r-- | zstd-vendor.spec | 101 |
4 files changed, 150 insertions, 0 deletions
@@ -0,0 +1 @@ +/ros-humble-zstd-vendor_0.15.5.orig.tar.gz diff --git a/0-zstd-vendor-change-cmake-download.patch b/0-zstd-vendor-change-cmake-download.patch new file mode 100644 index 0000000..c791380 --- /dev/null +++ b/0-zstd-vendor-change-cmake-download.patch @@ -0,0 +1,47 @@ +diff -Naur ros-humble-zstd-vendor-0.15.4_org/apply-patches ros-humble-zstd-vendor-0.15.4/apply-patches +--- ros-humble-zstd-vendor-0.15.4_org/apply-patches 1970-01-01 08:00:00.000000000 +0800 ++++ ros-humble-zstd-vendor-0.15.4/apply-patches 2023-04-25 17:55:33.603762587 +0800 +@@ -0,0 +1,13 @@ ++#!/bin/bash ++ ++tar -xf zstd-1.5.0.tar.gz ++cd zstd-1.5.0 ++ ++for p in `grep -P "^Patch\d+:" ../zstd.spec | awk '{print $2}'` ++do ++ patch -p1 < ../$p ++done ++ ++cd .. ++mv zstd-1.5.0/* . ++ +diff -Naur ros-humble-zstd-vendor-0.15.4_org/CMakeLists.txt ros-humble-zstd-vendor-0.15.4/CMakeLists.txt +--- ros-humble-zstd-vendor-0.15.4_org/CMakeLists.txt 2023-04-25 17:47:31.596701680 +0800 ++++ ros-humble-zstd-vendor-0.15.4/CMakeLists.txt 2023-04-25 18:54:12.563311748 +0800 +@@ -31,9 +31,11 @@ + # The CMakeLists.txt file for zstd is in a subdirectory. + # We need to configure the CMake command to build from there instead. + ExternalProject_Add(zstd-${zstd_version} +- GIT_REPOSITORY https://github.com/facebook/zstd.git +- GIT_TAG 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee # v${zstd_version} ++ GIT_REPOSITORY https://gitee.com/src-openeuler/zstd.git ++ GIT_TAG openEuler-22.03-LTS-SP1 + GIT_CONFIG advice.detachedHead=false ++ PATCH_COMMAND ++ sh ${CMAKE_CURRENT_SOURCE_DIR}/apply-patches + # Suppress git update due to https://gitlab.kitware.com/cmake/cmake/-/issues/16419 + # See https://github.com/ament/uncrustify_vendor/pull/22 for details + UPDATE_COMMAND "" +@@ -45,12 +47,6 @@ + -DZSTD_BUILD_SHARED=ON + -DZSTD_BUILD_PROGRAMS=OFF + ${extra_cmake_args} +- # Note: zstd v1.4.6 will include the following fix. When that is released, upgrade and remove this patch. +- PATCH_COMMAND +- ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_minimum_required_2.8.12.patch && +- ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn +- ${CMAKE_CURRENT_SOURCE_DIR}/no_internal_headers.patch + ) + + install( @@ -0,0 +1 @@ +3a634ad4c81a5da369f862c6aa9350eb ros-humble-zstd-vendor_0.15.5.orig.tar.gz diff --git a/zstd-vendor.spec b/zstd-vendor.spec new file mode 100644 index 0000000..56c5359 --- /dev/null +++ b/zstd-vendor.spec @@ -0,0 +1,101 @@ +%bcond_without tests +%bcond_without weak_deps + +%global debug_package %{nil} +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') +%global __provides_exclude_from ^/opt/ros/%{ros_distro}/.*$ +%global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$ + +%define RosPkgName zstd-vendor +%define ros_distro humble + +Name: ros-%{ros_distro}-%{RosPkgName} +Version: 0.15.5 +Release: 1%{?dist}%{?release_suffix} +Summary: Zstd compression vendor package, providing a dependency for Zstd. + +Url: https://facebook.github.io/zstd/ +License: Apache License 2.0 and BSD +Source0: %{name}_%{version}.orig.tar.gz +Patch0: 0-zstd-vendor-change-cmake-download.patch + +Requires: libzstd-devel +Requires: ros-%{ros_distro}-ros-workspace + +BuildRequires: libzstd-devel +BuildRequires: ros-%{ros_distro}-ament-cmake +BuildRequires: git +BuildRequires: ros-%{ros_distro}-ros-workspace + +%if 0%{?with_tests} +%endif + +Provides: %{name}-devel = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +Provides: %{name}-runtime = %{version}-%{release} + +%description +Zstd compression vendor package, providing a dependency for Zstd. + +%prep +%autosetup -p1 + +%build +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# In case we're installing to a non-standard location, look for a setup.sh +# in the install tree and source it. It will set things like +# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. +if [ -f "/opt/ros/%{ros_distro}/setup.sh" ]; then . "/opt/ros/%{ros_distro}/setup.sh"; fi +mkdir -p .obj-%{_target_platform} && cd .obj-%{_target_platform} +%cmake3 \ + -UINCLUDE_INSTALL_DIR \ + -ULIB_INSTALL_DIR \ + -USYSCONF_INSTALL_DIR \ + -USHARE_INSTALL_PREFIX \ + -ULIB_SUFFIX \ + -DCMAKE_INSTALL_PREFIX="/opt/ros/%{ros_distro}" \ + -DAMENT_PREFIX_PATH="/opt/ros/%{ros_distro}" \ + -DCMAKE_PREFIX_PATH="/opt/ros/%{ros_distro}" \ + -DSETUPTOOLS_DEB_LAYOUT=OFF \ +%if !0%{?with_tests} + -DBUILD_TESTING=OFF \ +%endif + .. + +%make_build + +%install +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# In case we're installing to a non-standard location, look for a setup.sh +# in the install tree and source it. It will set things like +# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. +if [ -f "/opt/ros/%{ros_distro}/setup.sh" ]; then . "/opt/ros/%{ros_distro}/setup.sh"; fi +%make_install -C .obj-%{_target_platform} + +%if 0%{?with_tests} +%check +# Needed to bootstrap since the ros_workspace package does not yet exist. +export PYTHONPATH=/opt/ros/%{ros_distro}/lib/python%{python3_version}/site-packages + +# Look for a Makefile target with a name indicating that it runs tests +TEST_TARGET=$(%__make -qp -C .obj-%{_target_platform} | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") +if [ -n "$TEST_TARGET" ]; then +# In case we're installing to a non-standard location, look for a setup.sh +# in the install tree and source it. It will set things like +# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. +if [ -f "/opt/ros/%{ros_distro}/setup.sh" ]; then . "/opt/ros/%{ros_distro}/setup.sh"; fi +CTEST_OUTPUT_ON_FAILURE=1 \ + %make_build -C .obj-%{_target_platform} $TEST_TARGET || echo "RPM TESTS FAILED" +else echo "RPM TESTS SKIPPED"; fi +%endif + +%files +/opt/ros/%{ros_distro} + +%changelog +* Thu May 04 2023 Michael Orlov michael.orlov@apex.ai - 0.15.5-1 +- Autogenerated by ros-porting-tools |