diff --git a/0001-cxx-Arg-List-Too-Long.patch b/0001-cxx-Arg-List-Too-Long.patch index 715d775aad3bc2a799ce256ee2be86d33f52e954..0e0d4571c4b17d318707a8bf7fbdaf398d976636 100644 --- a/0001-cxx-Arg-List-Too-Long.patch +++ b/0001-cxx-Arg-List-Too-Long.patch @@ -2,7 +2,7 @@ diff --git a/Makefile b/Makefile index e8635eda2d..6ede6e34d2 100644 --- a/Makefile +++ b/Makefile -@@ -3009,6 +3009,14 @@ install-headers_cxx: +@@ -3214,6 +3214,14 @@ install-headers_cxx: $(E) "[INSTALL] Installing public C++ headers" $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1 $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1 @@ -17,7 +17,7 @@ index e8635eda2d..6ede6e34d2 100644 install-static: install-static_c install-static_cxx -@@ -5518,6 +5526,8 @@ PUBLIC_HEADERS_CXX += \ +@@ -6190,6 +6198,8 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/support/stub_options.h \ include/grpc++/support/sync_stream.h \ include/grpc++/support/time.h \ @@ -26,8 +26,8 @@ index e8635eda2d..6ede6e34d2 100644 include/grpcpp/alarm.h \ include/grpcpp/alarm_impl.h \ include/grpcpp/channel.h \ -@@ -5588,6 +5598,8 @@ PUBLIC_HEADERS_CXX += \ - include/grpcpp/support/sync_stream.h \ +@@ -6267,6 +6277,8 @@ PUBLIC_HEADERS_CXX += \ + include/grpcpp/support/sync_stream_impl.h \ include/grpcpp/support/time.h \ include/grpcpp/support/validate_service_config.h \ + @@ -35,7 +35,7 @@ index e8635eda2d..6ede6e34d2 100644 include/grpc/support/alloc.h \ include/grpc/support/atm.h \ include/grpc/support/atm_gcc_atomic.h \ -@@ -5639,6 +5651,8 @@ PUBLIC_HEADERS_CXX += \ +@@ -6320,6 +6332,8 @@ PUBLIC_HEADERS_CXX += \ include/grpc/impl/codegen/propagation_bits.h \ include/grpc/impl/codegen/slice.h \ include/grpc/impl/codegen/status.h \ @@ -44,7 +44,7 @@ index e8635eda2d..6ede6e34d2 100644 include/grpc++/impl/codegen/async_stream.h \ include/grpc++/impl/codegen/async_unary_call.h \ include/grpc++/impl/codegen/byte_buffer.h \ -@@ -5669,6 +5683,8 @@ PUBLIC_HEADERS_CXX += \ +@@ -6350,6 +6364,8 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/impl/codegen/stub_options.h \ include/grpc++/impl/codegen/sync_stream.h \ include/grpc++/impl/codegen/time.h \ @@ -52,4 +52,4 @@ index e8635eda2d..6ede6e34d2 100644 +PUBLIC_HEADERS_CXX4 += \ include/grpcpp/impl/codegen/async_generic_service.h \ include/grpcpp/impl/codegen/async_stream.h \ - include/grpcpp/impl/codegen/async_unary_call.h \ + include/grpcpp/impl/codegen/async_stream_impl.h \ diff --git a/0002-patch-from-15532.patch b/0002-patch-from-15532.patch deleted file mode 100644 index 7d04671475a3183c53f5f09c93a7357bc70354ca..0000000000000000000000000000000000000000 --- a/0002-patch-from-15532.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 63c843f040cd5e9503bdcdf9b3285ef371bcadb6 Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev -Date: Sat, 21 Dec 2019 19:05:23 +0800 -Subject: [PATCH] patch from #15532 - ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 51a355b..9abd5df 100644 ---- a/Makefile -+++ b/Makefile -@@ -348,7 +348,7 @@ HOST_LD ?= $(LD) - HOST_LDXX ?= $(LDXX) - - CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) --CXXFLAGS += -std=c++11 -+CXXFLAGS += -std=c++11 -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-stringop-truncation -Wno-sizeof-pointer-div - ifeq ($(SYSTEM),Darwin) - CXXFLAGS += -stdlib=libc++ - endif -@@ -8304,7 +8304,7 @@ LIBBORINGSSL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename - - $(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX - $(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-rtti -fno-exceptions --$(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough $(NO_W_EXTRA_SEMI) -+$(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough -Wno-cast-function-type $(NO_W_EXTRA_SEMI) - - $(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBORINGSSL_OBJS) - $(E) "[AR] Creating $@" -@@ -8548,7 +8548,7 @@ PUBLIC_HEADERS_C += \ - LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC)))) - - $(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,) --$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,) -+$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion -Wno-sizeof-pointer-memaccess -Wno-stringop-overflow $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,) - - $(LIBDIR)/$(CONFIG)/libares.a: $(LIBARES_OBJS) - $(E) "[AR] Creating $@" --- -2.19.1 - diff --git a/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz b/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..62bdb43a09c9b4d4699b25b130e8c2b4c158b3fd Binary files /dev/null and b/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz differ diff --git a/grpc-1.22.0.tar.gz b/grpc-1.28.1.tar.gz similarity index 35% rename from grpc-1.22.0.tar.gz rename to grpc-1.28.1.tar.gz index 6f230fa7852b6773c0b1275c508e366135a303b2..2266421918507d9afca37f50ad5436ce51d08526 100644 Binary files a/grpc-1.22.0.tar.gz and b/grpc-1.28.1.tar.gz differ diff --git a/grpc.spec b/grpc.spec index 973e8542f727a3a841459eaa0bb05a910b1e0332..2af482e21f09788037170224c52dea2c01019500 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,16 +1,15 @@ Name: grpc -Version: 1.22.0 -Release: 3 +Version: 1.28.1 +Release: 1 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz Patch9000: 0001-cxx-Arg-List-Too-Long.patch Patch9001: 0002-add-secure-compile-option-in-Makefile.patch -Patch0002: 0002-patch-from-15532.patch - BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler gdb BuildRequires: openssl-devel c-ares-devel gflags-devel gtest-devel zlib-devel gperftools-devel BuildRequires: python3-devel python3-setuptools python3-Cython @@ -47,6 +46,7 @@ Python3 bindings for gRPC. sed -i 's:^prefix ?= .*:prefix ?= %{_prefix}:' Makefile sed -i 's:$(prefix)/lib:$(prefix)/%{_lib}:' Makefile sed -i 's:^GTEST_LIB =.*::' Makefile +tar -zxf %{SOURCE1} --strip-components 1 -C %{_builddir}/%{name}-%{version}/third_party/abseil-cpp/ %build %make_build shared plugins @@ -76,7 +76,7 @@ make install-grpc-cli prefix="%{buildroot}%{_prefix}" %{_bindir}/grpc_*_plugin %{_libdir}/*.so.1* -%{_libdir}/*.so.7* +%{_libdir}/*.so.9* %{_datadir}/grpc %files devel @@ -93,8 +93,11 @@ make install-grpc-cli prefix="%{buildroot}%{_prefix}" %{python3_sitearch}/grpcio-%{version}-py?.?.egg-info %changelog +* Tue Jun 9 2020 zhujunhao - 1.28.1-1 +- upadate to 1.28.1 + * Fri Mar 20 2020 songnannan - 1.22.0-3 -- add gdb in buildrequires +- add gdb in buildrequires * Sat Jan 11 2020 openEuler Buildteam - 1.22.0-2 - Delete unused patch