Merge pull request #8367 from cms-sw/gcc12-fix-std-iterator

protobuf/grpc: patch applied for deprecated std::iterator
cms-sw · Mar 9, 2023 · 4e97537 · 4e97537
2 parents 00c92cf + 6b8ba51
commit 4e97537
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/grpc.spec b/grpc.spec
@@ -1,6 +1,7 @@
 ### RPM external grpc 1.35.0
 
 Source: git+https://github.com/grpc/grpc.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
+Source1: https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/28212.patch
 Patch1: grpc-mno-outline-atomics
 BuildRequires: cmake ninja go
 Requires: protobuf zlib pcre c-ares abseil-cpp re2
@@ -9,6 +10,7 @@ Requires: protobuf zlib pcre c-ares abseil-cpp re2
 %prep
 
 %setup -n %{n}-%{realversion}
+patch -p1 <%{_sourcedir}/28212.patch
 %patch1 -p1
 
 %build

diff --git a/protobuf.spec b/protobuf.spec
@@ -8,13 +8,15 @@
 # protoc --cpp_out=. DQMServices/Core/src/ROOTFilePB.proto
 #######################################################
 
-Source: https://github.com/google/protobuf/archive/v%{realversion}.tar.gz
+Source:  https://github.com/google/protobuf/archive/v%{realversion}.tar.gz
+Source1: https://patch-diff.githubusercontent.com/raw/protocolbuffers/protobuf/pull/8741.patch
 Patch0: protobuf-3.15-gcc10
 Requires: zlib
 BuildRequires: cmake ninja
 
 %prep
 %setup -n %{n}-%{realversion}
+patch -p1 <%{_sourcedir}/8741.patch
 %patch0 -p1
 sed -i -e 's|CMAKE_CXX_STANDARD  *11|CMAKE_CXX_STANDARD 17|' cmake/CMakeLists.txt
 %build
@@ -25,6 +27,8 @@ cd ../build
 cmake ../%{n}-%{realversion}/cmake \
     -G Ninja \
     -DCMAKE_INSTALL_PREFIX="%{i}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_STANDARD=17 \
     -Dprotobuf_BUILD_TESTS=OFF \
     -Dprotobuf_BUILD_SHARED_LIBS=ON \
     -DCMAKE_INSTALL_LIBDIR=lib \

diff --git a/triton-inference-client.spec b/triton-inference-client.spec
@@ -40,6 +40,7 @@ cmake ${PROJ_DIR} \
     -DCMAKE_INSTALL_PREFIX="%{i}" \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_STANDARD=17 \
     -DTRITON_ENABLE_CC_HTTP=OFF \
     -DTRITON_ENABLE_CC_GRPC=ON \
     -DTRITON_ENABLE_PYTHON_HTTP=OFF \
@@ -56,7 +57,7 @@ cmake ${PROJ_DIR} \
     -DFETCHCONTENT_SOURCE_DIR_REPO-COMMON=${COMMON_DIR} \
     -DCMAKE_PREFIX_PATH="${GRPC_ROOT};${ABSEIL_CPP_ROOT};${RE2_ROOT}"
 
-make %{makeprocesses}
+make %{makeprocesses} VERBOSE=1
 
 %install
 cd ../build