diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-06-20 02:57:22 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-06-20 02:57:22 +0000 |
| commit | abfb6098a6be4cc99402fe3ba8d6c5c9c2205cb1 (patch) | |
| tree | 70c5455a89b843425bef102fa69668d82292a0bb /add-secure-compile-option-in-Makefile.patch | |
| parent | 548bcde539b9745dc1919efaa9519b30dacbbe22 (diff) | |
automatic import of grpcopeneuler23.03
Diffstat (limited to 'add-secure-compile-option-in-Makefile.patch')
| -rw-r--r-- | add-secure-compile-option-in-Makefile.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/add-secure-compile-option-in-Makefile.patch b/add-secure-compile-option-in-Makefile.patch new file mode 100644 index 0000000..4926838 --- /dev/null +++ b/add-secure-compile-option-in-Makefile.patch @@ -0,0 +1,32 @@ +From:bitcoffee<854182924@qq.com> +Reason:add-secure-compile-option-in-Makefile +base on author:zhuchunyi commit:b00721fa +diff -urN grpc/CMakeLists.txt grpc_new/CMakeLists.txt +--- grpc/CMakeLists.txt 2020-08-24 09:14:14.361862041 +0800 ++++ grpc_new/CMakeLists.txt 2020-08-27 15:36:51.498277936 +0800 +@@ -225,6 +226,9 @@ + endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2") ++set(_gRPC_ALLTARGETS_LIBRARYIES "${_gRPC_ALLTARGETS_LIBRARYIES} -Wl,-z,relro -Wl,-z,now -pie") + + 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,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2 ++CPPFLAGS += -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2 ++LDFLAGS += -Wl,-z,relro -Wl,-z,now -pie ++ + HOST_CPPFLAGS += $(CPPFLAGS) + HOST_CFLAGS += $(CFLAGS) + HOST_CXXFLAGS += $(CXXFLAGS) |