diff options
| -rw-r--r-- | 396.patch | 22 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-datadog-trace.spec | 12 |
4 files changed, 8 insertions, 30 deletions
diff --git a/396.patch b/396.patch deleted file mode 100644 index b4b4ab6..0000000 --- a/396.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cd4d854606a17b24d7a37fb46f5b7eb559062ad8 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 9 Apr 2019 09:25:10 +0200 -Subject: [PATCH] fix #395 build with -std=c99 option - ---- - config.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.m4 b/config.m4 -index 042812e7..62ee41e7 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -10,7 +10,7 @@ if test "$PHP_DDTRACE" != "no"; then - PHP_SUBST(EXTRA_CFLAGS) - fi - -- PHP_NEW_EXTENSION(ddtrace, src/ext/ddtrace.c src/ext/dispatch_setup.c src/ext/dispatch.c src/ext/request_hooks.c src/ext/compat_zend_string.c src/ext/dispatch_compat_php5.c src/ext/dispatch_compat_php7.c src/ext/backtrace.c src/ext/logging.c src/ext/env_config.c src/ext/serializer.c src/ext/mpack/mpack.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) -+ PHP_NEW_EXTENSION(ddtrace, src/ext/ddtrace.c src/ext/dispatch_setup.c src/ext/dispatch.c src/ext/request_hooks.c src/ext/compat_zend_string.c src/ext/dispatch_compat_php5.c src/ext/dispatch_compat_php7.c src/ext/backtrace.c src/ext/logging.c src/ext/env_config.c src/ext/serializer.c src/ext/mpack/mpack.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -Wall -std=c99) - PHP_ADD_BUILD_DIR($ext_builddir/src/ext, 1) - - PHP_ADD_INCLUDE($ext_builddir) @@ -7,7 +7,7 @@ For help, check out the documentation at https://docs.datadoghq.com/tracing/lang (c) Datadog 2019 Datadog tracing support => enabled -Version => 0.18.0 +Version => 0.19.0 Directive => Local Value => Master Value ddtrace.disable => Off => Off @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 ddtrace version 0.18.0 ] { +Extension [ <persistent> extension #87 ddtrace version 0.19.0 ] { - INI { Entry [ ddtrace.disable <SYSTEM> ] diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 6a3e204..56e60ca 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -34,14 +34,12 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.18.0 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 0.19.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: http://pecl.php.net/package/%{proj_name} Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/DataDog/dd-trace-php/pull/396.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -102,7 +100,6 @@ sed -e 's/role="test"/role="src"/' \ cd NTS cp src/ext/mpack/LICENSE LICENSE.mpack -%patch0 -p1 -b .pr396 : Sanity check, really often broken extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) @@ -175,7 +172,7 @@ done %check -%if %{__isa_bits} < 64 +%if "%{php_version}" < "7" rm ?TS/tests/ext/dd_trace_serialize_msgpack.phpt rm ?TS/tests/ext/dd_trace_serialize_msgpack_error.phpt rm ?TS/tests/ext/dd_trace_serialize_msgpack_error_strict.phpt @@ -249,6 +246,9 @@ fi %changelog +* Sun Apr 14 2019 Remi Collet <remi@remirepo.net> - 0.19.0-1 +- update to 0.19.0 + * Tue Apr 9 2019 Remi Collet <remi@remirepo.net> - 0.18.0-2 - test build |