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

!604 enable grpc and fix compile failed

Browse Source 
* enable grpc and fix compile failed
This commit is contained in:
zhangxiaoyu 2023-08-21 09:30:26 +00:00 committed by haozi007
parent e1bc9f53ba
commit 79b05a9448
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
iSulad.spec
View File

@ -1,5 +1,5 @@
%global _version 2.1.2 %global _version 2.1.2
%global _release 6 %global _release 7
%global is_systemd 1 %global is_systemd 1
%global enable_shimv2 1 %global enable_shimv2 1
%global is_embedded 1 %global is_embedded 1
@ -99,17 +99,20 @@ mkdir -p build
cd build cd build
%if 0%{?enable_shimv2} %if 0%{?enable_shimv2}
%if %{defined openeuler} %if %{defined openeuler}
%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../
%else %else
%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_SHIM_V2=ON -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../
%endif %endif
%else %else
%if %{defined openeuler} %if %{defined openeuler}
%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_UT=OFF -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../
%else %else
%cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=OFF -DCMAKE_CXX_STANDARD=%{cpp_std} ../ %cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_GRPC_REMOTE_CONNECT=OFF -DENABLE_GRPC=ON -DCMAKE_CXX_STANDARD=%{cpp_std} ../
%endif %endif
%endif %endif
sed -i "10 a\# undef linux" grpc/src/api/services/cri/api.pb.h
%make_build %make_build
%check %check
@ -274,6 +277,12 @@ fi
%endif %endif
%changelog %changelog
* Mon Aug 21 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.1.2-7
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: enable grpc and fix compile failed
* Wed Aug 09 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.1.2-6 * Wed Aug 09 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.1.2-6
- Type: bugfix - Type: bugfix
- ID: NA - ID: NA