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 /274.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 '274.patch')
| -rw-r--r-- | 274.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/274.patch b/274.patch deleted file mode 100644 index 80f2d64..0000000 --- a/274.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 |