diff options
| author | Remi Collet <remi@remirepo.net> | 2020-10-15 11:40:08 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-10-15 11:40:08 +0200 |
| commit | bb02015caf32f1fafddc750b4e5090d1de1a7533 (patch) | |
| tree | 9d8b1b0b720cebdbdbd5dc7eefd366679debb766 /274.patch | |
| parent | b0987b8ab1e2ba3dfe3d0990e8979a106f700f50 (diff) | |
update to 4.0.0
add patch to properly use cxx for link from
https://github.com/SkyAPM/SkyAPM-php-sdk/pull/274
Diffstat (limited to '274.patch')
| -rw-r--r-- | 274.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/274.patch b/274.patch new file mode 100644 index 0000000..80f2d64 --- /dev/null +++ b/274.patch @@ -0,0 +1,30 @@ +From 16ed1a4d463014d93b1ddfb432323d00a4ba17a6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 15 Oct 2020 10:58:51 +0200 +Subject: [PATCH] use cxx for link, and drop uneeded libstdc++ + +--- + config.m4 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index adb7f77..f110c4d 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -78,7 +78,6 @@ if test "$PHP_SKYWALKING" != "no"; then + PHP_ADD_LIBRARY(c++,1,SKYWALKING_SHARED_LIBADD) + ;; + *) +- PHP_ADD_LIBRARY(stdc++,1,SKYWALKING_SHARED_LIBADD) + PHP_ADD_LIBRARY(rt,,SKYWALKING_SHARED_LIBADD) + PHP_ADD_LIBRARY(rt) + ;; +@@ -152,7 +151,7 @@ if test "$PHP_SKYWALKING" != "no"; then + src/network/v3/language-agent/Tracing_grpc.pb.cc \ + src/network/v3/management/Management_grpc.pb.cc \ + src/network/v3/management/Management.pb.cc \ +- , $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) ++ , $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, cxx) + fi + + if test -r $phpincludedir/ext/mysqli/mysqli_mysqlnd.h; then |