From 78b66ad5b91fa69b698ac7e0506534cc63565614 Mon Sep 17 00:00:00 2001 From: Jozef Izso Date: Sat, 22 Aug 2020 10:16:03 +0200 Subject: [grpc] grpc v1.30.2 (#12920) --- ports/grpc/00002-static-linking-in-linux.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ports/grpc/00002-static-linking-in-linux.patch') diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch index 371873888..7bd6ba1aa 100644 --- a/ports/grpc/00002-static-linking-in-linux.patch +++ b/ports/grpc/00002-static-linking-in-linux.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 84de29f..0c6dc0e 100644 +index dd9ffd95f9..9f35ad3f6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -165,6 +165,11 @@ set(CMAKE_CXX_EXTENSIONS OFF) - - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -180,6 +180,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) + endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -+ + +if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS) + # Force to static link + set(CMAKE_EXE_LINKER_FLAGS "-Bstatic") +endif() - ++ if(MSVC) include(cmake/msvc_static_runtime.cmake) + add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -- cgit v1.2.3 From 3283dd7fb7044118a302c9e32956aaaf3afc9b04 Mon Sep 17 00:00:00 2001 From: Jozef Izso Date: Sun, 23 Aug 2020 07:25:20 +0200 Subject: [grpc][upb][re2] grpc v1.31.1 (#13084) --- ports/grpc/00002-static-linking-in-linux.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ports/grpc/00002-static-linking-in-linux.patch') diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch index 7bd6ba1aa..80ec441b3 100644 --- a/ports/grpc/00002-static-linking-in-linux.patch +++ b/ports/grpc/00002-static-linking-in-linux.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd9ffd95f9..9f35ad3f6c 100644 +index 086d4c5837..e556a99b47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -180,6 +180,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -183,6 +183,11 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -- cgit v1.2.3