diff options
author | Remi Collet <remi@remirepo.net> | 2020-11-13 09:02:51 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2020-11-13 09:02:51 +0100 |
commit | e2dd3d55a95ec6b0b63ce9b56bc95f4ea1229ff3 (patch) | |
tree | ea9679166f71be8a6190299cdb714f950fdb57a9 /275.patch | |
parent | d069dc3d5fb14c394bc0323338b34ae42a497491 (diff) |
update to 4.1.0
drop patches merged upstream
add patch to fix build with PHP 8 from
https://github.com/SkyAPM/SkyAPM-php-sdk/pull/294
Diffstat (limited to '275.patch')
-rw-r--r-- | 275.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/275.patch b/275.patch deleted file mode 100644 index 37958a8..0000000 --- a/275.patch +++ /dev/null @@ -1,38 +0,0 @@ -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} |