diff --git a/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz b/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz deleted file mode 100644 index 62bdb43..0000000 Binary files a/abseil-cpp-b832dce8489ef7b6231384909fd9b68d5a5ff2b7.tar.gz and /dev/null differ diff --git a/add-secure-compile-option-in-Makefile.patch b/add-secure-compile-option-in-Makefile.patch index 3d50d39..4705fda 100644 --- a/add-secure-compile-option-in-Makefile.patch +++ b/add-secure-compile-option-in-Makefile.patch @@ -14,3 +14,19 @@ diff -urN grpc/CMakeLists.txt grpc_new/CMakeLists.txt if(gRPC_USE_PROTO_LITE) set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf-lite") + +diff --git a/Makefile b/Makefile +index 6ede6e34d2..d6190ecde4 100644 +--- a/Makefile ++++ b/Makefile +@@ -478,6 +478,10 @@ LDFLAGS += $(EXTRA_LDFLAGS) + DEFINES += $(EXTRA_DEFINES) + LDLIBS += $(EXTRA_LDLIBS) + ++CFLAGS += -Wl,-z,now -fPIE -fPIC ++CPPFLAGS += -Wl,-z,now -fstack-protector-strong ++LDFLAGS += -Wl,-z,now -pie ++ + HOST_CPPFLAGS += $(CPPFLAGS) + HOST_CFLAGS += $(CFLAGS) + HOST_CXXFLAGS += $(CXXFLAGS) diff --git a/grpc.spec b/grpc.spec index 6e32fcd..28aae8d 100644 --- a/grpc.spec +++ b/grpc.spec @@ -5,7 +5,7 @@ Summary: A modern, open source high performance RPC framework that can run 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 +Source1: abseil-20200225.tar.gz Source2: benchmark-v1.5.1.tar.gz Source3: re2-2020-08-01.tar.gz Source4: googletest-release-1.10.0.tar.gz @@ -158,4 +158,4 @@ rm -rf %{buildroot}%{_prefix}/lib - Delete unused patch * Sat Dec 21 2019 openEuler Buildteam - 1.22.0-1 -- Package init \ No newline at end of file +- Package init