packages/nodelet_core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!22 修复poco重复提供动态链接库

Browse Source 
From: @davidhan008 
Reviewed-by: @anchuanxu 
Signed-off-by: @anchuanxu
This commit is contained in:
openeuler-ci-bot 2023-08-22 11:20:02 +00:00 committed by Gitee
commit 74f62f8d12
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nodelet_core.spec
View File

@ -86,31 +86,28 @@ cd ..
cd .. cd ..
#compile #compile
./src/catkin/bin/catkin_make_isolated --install #./src/catkin/bin/catkin_make_isolated --install
cp install_dependence.sh install_isolated/ #cp install_dependence.sh install_isolated/
#### ####
# 对install_isoloate内部的变量名称进行替换 # 对install_isoloate内部的变量名称进行替换
# #
#### ####
SRC_PATH=$PWD/install_isolated #SRC_PATH=$PWD/install_isolated
DST_PATH=/opt/ros/noetic #DST_PATH=/opt/ros/noetic
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*` #sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install_isolated/*`
#### ####
# 添加.catkin和.rosinstall文件 # 添加.catkin和.rosinstall文件
# #
#### ####
mkdir -p %{buildroot}/opt/ros/noetic/ #mkdir -p %{buildroot}/opt/ros/noetic/
cp -r install_isolated/* %{buildroot}/opt/ros/noetic/ #cp -r install_isolated/* %{buildroot}/opt/ros/noetic/
cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/ #cp install_isolated/.rosinstall %{buildroot}/opt/ros/noetic/
cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/ #cp install_isolated/.catkin %{buildroot}/opt/ros/noetic/
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/opt/ros/noetic/*
/opt/ros/noetic/.rosinstall
/opt/ros/noetic/.catkin
%changelog %changelog
* Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1 * Tue Dec 15 2020 openEuler Buildteam <hanhaomin008@126.com> - 1.10.1-1