jengelh/grpc
SHA256
1
0
Fork 1
forked from pool/grpc
Code Pull Requests 1 Activity

- Add grpc-cxx17.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=96
This commit is contained in:
Jan Engelhardt 2021-06-02 23:13:42 +00:00 committed by Git OBS Bridge
parent 8e10a826df
commit 711b048648
4 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grpc-correct-pkgconfig-path.patch
View File

@ -1,3 +1,8 @@
Date: Sun Oct 11 16:14:38 UTC 2020
From: Atri Bhattacharya <badshah400@gmail.com>
Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification
Index: grpc-1.34.0/CMakeLists.txt
===================================================================
--- grpc-1.34.0.orig/CMakeLists.txt

36
grpc-cxx17.patch Normal file
View File

@ -0,0 +1,36 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2021-06-03 01:08:48.201340252 +0200
absl changes behavior depending on -std=. It is built with the implied default -std=.
grpc must therefore do the sample (use standard -std=).
---
CMakeLists.txt | 15 ---------------
1 file changed, 15 deletions(-)
Index: grpc-1.38.0/CMakeLists.txt
===================================================================
--- grpc-1.38.0.orig/CMakeLists.txt
+++ grpc-1.38.0/CMakeLists.txt
@@ -189,21 +189,6 @@ if (NOT DEFINED CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 99)
endif()
-# Add c++11 flags
-if (NOT DEFINED CMAKE_CXX_STANDARD)
- set(CMAKE_CXX_STANDARD 11)
-else()
- if (CMAKE_CXX_STANDARD LESS 11)
- message(FATAL_ERROR "CMAKE_CXX_STANDARD is less than 11, please specify at least SET(CMAKE_CXX_STANDARD 11)")
- endif()
-endif()
-if (NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-if (NOT DEFINED CMAKE_CXX_EXTENSIONS)
- set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
endif()

5
grpc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 2 23:13:25 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Add grpc-cxx17.patch
-------------------------------------------------------------------
Fri May 21 11:24:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>

2
grpc.spec
View File

@ -28,8 +28,8 @@ Group: Development/Tools/Building
URL: https://grpc.io/
Source: https://github.com/grpc/grpc/archive/v%version.tar.gz
Source2: %name-rpmlintrc
# PATCH-FIX-UPSTREAM grpc-correct-pkgconfig-path.patch badshah400@gmail.com -- Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification
Patch1: grpc-correct-pkgconfig-path.patch
Patch2: grpc-cxx17.patch
BuildRequires: abseil-cpp-devel
BuildRequires: cmake
BuildRequires: fdupes