From d069dc3d5fb14c394bc0323338b34ae42a497491 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 15 Oct 2020 12:12:59 +0200
Subject: add patch to properly check available command from  
 https://github.com/SkyAPM/SkyAPM-php-sdk/pull/275 add patch to fix build with
 PHP 8 from   https://github.com/SkyAPM/SkyAPM-php-sdk/pull/276

---
 275.patch | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 275.patch

(limited to '275.patch')

diff --git a/275.patch b/275.patch
new file mode 100644
index 0000000..37958a8
--- /dev/null
+++ b/275.patch
@@ -0,0 +1,38 @@
+From 31c23f5f4109e795aa502c3a133a2dba7e1740c1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 15 Oct 2020 11:32:14 +0200
+Subject: [PATCH] ensure used commands are available at configure time
+
+---
+ config.m4 | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index f110c4d..559c160 100644
+--- a/config.m4
++++ b/config.m4
+@@ -110,11 +110,20 @@ if test "$PHP_SKYWALKING" != "no"; then
+     -L$GRPC_LIBDIR
+   ])
+ 
++  AC_PATH_PROG(PROTOC, protoc, no)
++  if ! test -x "$PROTOC"; then
++    AC_MSG_ERROR([protoc command missing, please reinstall the protobuf distribution])
++  fi
++  AC_PATH_PROG(GRPC_CPP_PLUGIN, grpc_cpp_plugin, no)
++  if ! test -x "$GRPC_CPP_PLUGIN"; then
++    AC_MSG_ERROR([grpc_cpp_plugin command missing, please reinstall the grpc distribution])
++  fi
++
+   mkdir -p src/network/v3
+-  protoc -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` --cpp_out=src/network/v3 src/protocol/v3/common/Common.proto
+-  protoc -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` --cpp_out=src/network/v3 src/protocol/v3/language-agent/*.proto
+-  protoc -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` --cpp_out=src/network/v3 src/protocol/v3/profile/*.proto
+-  protoc -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` --cpp_out=src/network/v3 src/protocol/v3/management/*.proto
++  $PROTOC -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=$GRPC_CPP_PLUGIN --cpp_out=src/network/v3 src/protocol/v3/common/Common.proto
++  $PROTOC -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=$GRPC_CPP_PLUGIN --cpp_out=src/network/v3 src/protocol/v3/language-agent/*.proto
++  $PROTOC -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=$GRPC_CPP_PLUGIN --cpp_out=src/network/v3 src/protocol/v3/profile/*.proto
++  $PROTOC -I src/protocol/v3 --grpc_out=src/network/v3 --plugin=protoc-gen-grpc=$GRPC_CPP_PLUGIN --cpp_out=src/network/v3 src/protocol/v3/management/*.proto
+   find src -name "*.grpc.pb.cc" | while read id; do mv $id ${id/.grpc/_grpc}; done
+ 
+   PROTOBUF_LIBDIR=$PROTOBUF_DIR/${PROTOBUF_LIB_SUBDIR-lib}
-- 
cgit