diff options
| author | Remi Collet <remi@remirepo.net> | 2019-06-01 08:10:02 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-06-01 08:10:02 +0200 |
| commit | f4522595c05c3bff74ded51c4bca1a1ac7984ac7 (patch) | |
| tree | 8a4fbce5d968f511183becf7100d4f535b6992b8 /php-pecl-datadog-trace.spec | |
| parent | eabc1c8d680c17b8454078b7588760341077cd9f (diff) | |
v0.26.0
Diffstat (limited to 'php-pecl-datadog-trace.spec')
| -rw-r--r-- | php-pecl-datadog-trace.spec | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index d020e8e..d65aded 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -34,17 +34,20 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.23.0 +Version: 0.26.0 Release: 2%{?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/452.patch - +%if 0%{?rhel} == 6 +BuildRequires: devtoolset-6-toolchain +%else BuildRequires: %{?dtsprefix}gcc +%endif BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear +BuildRequires: curl-devel # For tests BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-posix @@ -106,7 +109,6 @@ sed -e 's/role="test"/role="src"/' \ cd NTS cp src/ext/mpack/LICENSE LICENSE.mpack -%patch0 -p1 : Sanity check, really often broken extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h) @@ -136,6 +138,9 @@ EOF %build +%if 0%{?rhel} == 6 +source /opt/rh/devtoolset-6/enable +%endif %{?dtsenable} cd NTS @@ -156,6 +161,9 @@ make %{?_smp_mflags} %install +%if 0%{?rhel} == 6 +source /opt/rh/devtoolset-6/enable +%endif %{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -182,6 +190,10 @@ done # Erratic result on 5.6 and EL-6 rm ?TS/tests/ext/segfault_backtrace_disabled_via_env_enabled_in_ini.phpt rm ?TS/tests/ext/segfault_backtrace_disabled.phpt +%if %{__isa_bits} < 64 +rm ?TS/tests/ext/dd_trace_coms_test_parallel_writer_consistency.phpt +%endif + MOD="-n" [ -f %{php_extdir}/json.so ] && MOD="$MOD -d extension=json.so" @@ -249,6 +261,10 @@ fi %changelog +* Sat Jun 1 2019 Remi Collet <remi@remirepo.net> - 0.26.0-1 +- update to 0.26.0 +- drop patch merged upstream + * Mon May 27 2019 Remi Collet <remi@remirepo.net> - 0.23.0-2 - add patch for 7.4 from https://github.com/DataDog/dd-trace-php/pull/452 |