!23 delete benchmark and googletest sources in grpc and rebase to 1.31.0-4
From: @eaglegai Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
commit
e35a15a5fc
Binary file not shown.
Binary file not shown.
18
grpc.spec
18
grpc.spec
@ -1,13 +1,11 @@
|
|||||||
Name: grpc
|
Name: grpc
|
||||||
Version: 1.31.0
|
Version: 1.31.0
|
||||||
Release: 2
|
Release: 4
|
||||||
Summary: A modern, open source high performance RPC framework that can run in any environment
|
Summary: A modern, open source high performance RPC framework that can run in any environment
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://www.grpc.io
|
URL: https://www.grpc.io
|
||||||
Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Source1: abseil-20200225.tar.gz
|
Source1: abseil-20200225.tar.gz
|
||||||
Source2: benchmark-v1.5.1.tar.gz
|
|
||||||
Source4: googletest-release-1.10.0.tar.gz
|
|
||||||
|
|
||||||
Patch0000: Copy-channel-args-hash-before-appending-ruby-user-ag.patch
|
Patch0000: Copy-channel-args-hash-before-appending-ruby-user-ag.patch
|
||||||
Patch0001: Ran-generate_proto_ruby.sh-to-update-generated-files.patch
|
Patch0001: Ran-generate_proto_ruby.sh-to-update-generated-files.patch
|
||||||
@ -28,9 +26,7 @@ BuildRequires: pkgconfig(re2)
|
|||||||
Requires: protobuf-compiler gflags
|
Requires: protobuf-compiler gflags
|
||||||
|
|
||||||
Provides: %{name}-plugins = %{version}-%{release}
|
Provides: %{name}-plugins = %{version}-%{release}
|
||||||
Provides: %{name}-cli = %{version}-%{release}
|
|
||||||
Obsoletes: %{name}-plugins < %{version}-%{release}
|
Obsoletes: %{name}-plugins < %{version}-%{release}
|
||||||
Obsoletes: %{name}-cli < %{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
gRPC is a modern open source high performance RPC framework that can run in any environment.
|
gRPC is a modern open source high performance RPC framework that can run in any environment.
|
||||||
@ -60,8 +56,6 @@ sed -i 's:^prefix ?= .*:prefix ?= %{_prefix}:' Makefile
|
|||||||
sed -i 's:$(prefix)/lib:$(prefix)/%{_lib}:' Makefile
|
sed -i 's:$(prefix)/lib:$(prefix)/%{_lib}:' Makefile
|
||||||
sed -i 's:^GTEST_LIB =.*::' Makefile
|
sed -i 's:^GTEST_LIB =.*::' Makefile
|
||||||
tar -zxf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/abseil-cpp/
|
tar -zxf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/abseil-cpp/
|
||||||
tar -zxf %{SOURCE2} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/benchmark/
|
|
||||||
tar -zxf %{SOURCE4} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/googletest/
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p cmake/build
|
mkdir -p cmake/build
|
||||||
@ -80,7 +74,6 @@ cmake ../../ -DgRPC_INSTALL=ON\
|
|||||||
-DgRPC_INSTALL_SHAREDIR=%{buildroot}%{_datadir}/%{name} \
|
-DgRPC_INSTALL_SHAREDIR=%{buildroot}%{_datadir}/%{name} \
|
||||||
-DgRPC_INSTALL_PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \
|
-DgRPC_INSTALL_PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||||
-DgRPC_BUILD_TESTS=ON \
|
|
||||||
-DBUILD_SHARED_LIBS=ON
|
-DBUILD_SHARED_LIBS=ON
|
||||||
make -j24 V=1
|
make -j24 V=1
|
||||||
|
|
||||||
@ -97,8 +90,6 @@ cd ../..
|
|||||||
%install
|
%install
|
||||||
cd cmake/build
|
cd cmake/build
|
||||||
make install/local
|
make install/local
|
||||||
cp grpc_cli %{buildroot}%{_bindir}
|
|
||||||
cp libgrpc++_test_config.so* %{buildroot}%{_libdir}
|
|
||||||
rm -rf %{buildroot}%{_prefix}/lib
|
rm -rf %{buildroot}%{_prefix}/lib
|
||||||
|
|
||||||
%delete_la_and_a
|
%delete_la_and_a
|
||||||
@ -112,7 +103,6 @@ cd ../..
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%{_bindir}/grpc_cli
|
|
||||||
%{_bindir}/grpc_*_plugin
|
%{_bindir}/grpc_*_plugin
|
||||||
|
|
||||||
%{_libdir}/*.so.1*
|
%{_libdir}/*.so.1*
|
||||||
@ -134,6 +124,12 @@ cd ../..
|
|||||||
%{python3_sitearch}/grpcio-%{version}-py?.?.egg-info
|
%{python3_sitearch}/grpcio-%{version}-py?.?.egg-info
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 23 2021 gaihuiying <gaihuiying1@huawei.com> - 1.31.0-4
|
||||||
|
- Type:requirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:delete benchmark and googletest sources in grpc and rebase to 1.31.0-4
|
||||||
|
|
||||||
* Wed Dec 09 2020 gaihuiying <gaihuiying1@huawei.com> - 1.31.0-2
|
* Wed Dec 09 2020 gaihuiying <gaihuiying1@huawei.com> - 1.31.0-2
|
||||||
- Type:requirement
|
- Type:requirement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user