[arch-commits] Commit in sysdig/trunk (0.27.1-grpc-absl-sync.patch PKGBUILD)

[Massimiliano Torromeo]

    Date: Friday, October 8, 2021 @ 22:36:23
  Author: mtorromeo
Revision: 1028097

upgpkg: sysdig 0.27.1-8: Fixed compilation issues with grpc-1.41 (Fixes FS#72262)

Added:
  sysdig/trunk/0.27.1-grpc-absl-sync.patch
Modified:
  sysdig/trunk/PKGBUILD

-----------------------------+
 0.27.1-grpc-absl-sync.patch |   22 ++++++++++++++++++++++
 PKGBUILD                    |    9 ++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

Added: 0.27.1-grpc-absl-sync.patch
===================================================================
--- 0.27.1-grpc-absl-sync.patch	                        (rev 0)
+++ 0.27.1-grpc-absl-sync.patch	2021-10-08 22:36:23 UTC (rev 1028097)
@@ -0,0 +1,22 @@
+diff -rup sysdig-0.27.1/CMakeLists.txt sysdig-0.27.1-grpc-1.41/CMakeLists.txt
+--- sysdig-0.27.1/CMakeLists.txt	2020-09-30 16:21:52.000000000 +0200
++++ sysdig-0.27.1-grpc-1.41/CMakeLists.txt	2021-10-08 23:46:51.058659662 +0200
+@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE)
+ 			else()
+ 				message(FATAL_ERROR "Couldn't find system grpc")
+ 			endif()
++			find_library(ABSL_SYNC_LIB NAMES absl_synchronization)
+ 			find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+ 			if(NOT GRPC_CPP_PLUGIN)
+ 				message(FATAL_ERROR "System grpc_cpp_plugin not found")
+diff -rup sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt
+--- sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt	2020-09-30 16:21:52.000000000 +0200
++++ sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt	2021-10-08 23:46:35.785353019 +0200
+@@ -209,6 +209,7 @@ if(NOT WIN32)
+ 			target_link_libraries(sinsp
+ 				"${GRPCPP_LIB}"
+ 				"${GRPC_LIB}"
++				"${ABSL_SYNC_LIB}"
+ 				"${PROTOBUF_LIB}"
+ 				"${CARES_LIB}"
+ 				"${JQ_LIB}"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-08 22:09:38 UTC (rev 1028096)
+++ PKGBUILD	2021-10-08 22:36:23 UTC (rev 1028097)
@@ -5,7 +5,7 @@
 pkgbase=sysdig
 pkgname=(sysdig sysdig-dkms)
 pkgver=0.27.1
-pkgrel=7
+pkgrel=8
 pkgdesc="Open source system-level exploration and troubleshooting tool"
 arch=('x86_64')
 url="https://www.sysdig.com/"
@@ -13,15 +13,18 @@
 makedepends=('cmake' 'pandoc' 'gtest' 'jsoncpp' 'libjsoncpp.so' 'luajit' 'curl' 'libcurl.so' 'jq' 'libb64' 'intel-tbb' 'grpc' 'libgrpc++_unsecure.so')
 source=("https://github.com/draios/sysdig/archive/$pkgver/$pkgbase-$pkgver.tar.gz"
         "bashcomp-location.patch"
-        "glibc.patch")
+        "glibc.patch"
+        "0.27.1-grpc-absl-sync.patch")
 sha256sums=('b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda'
             'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
-            '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939')
+            '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939'
+            '9390c4c2d8aef6110aae63835aab07585bbe9856c820020750e0ba678e4da653')
 
 prepare() {
   cd "$srcdir"/$pkgbase-$pkgver
   patch -p1 -i "$srcdir"/bashcomp-location.patch
   patch -p1 -i "$srcdir"/glibc.patch
+  patch -p1 -i "$srcdir"/0.27.1-grpc-absl-sync.patch
 }
 
 build() {