diff options
| author | Remi Collet <remi@remirepo.net> | 2023-09-07 12:31:13 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-09-07 12:31:13 +0200 |
| commit | bc6113ee25341b1294efb1238abc6f183f4aeb18 (patch) | |
| tree | 656647bc0fec06d6a8b9ff6fff845d1fae6a39a7 /php-pecl-datadog-trace.spec | |
| parent | 5cf4dd1d3ebdf374ec3121e5993ecfbe12f07e33 (diff) | |
update to 0.91.0
raise build dependency on rust 1.70
Diffstat (limited to 'php-pecl-datadog-trace.spec')
| -rw-r--r-- | php-pecl-datadog-trace.spec | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 28b95ce..c917223 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -13,6 +13,11 @@ %global _root_bindir %{_bindir} %endif +# TODO: build for EL-8 and EL-9 +# see https://rpms.remirepo.net/rpmphp/zoom.php?rpm=rust +# if needed, build using --enablerepo=stream +# and delete root_cache after the build + # pecl name %global proj_name datadog_trace # no underscore for package name @@ -29,7 +34,7 @@ Summary: APM and distributed tracing for PHP Name: %{?scl_prefix}php-pecl-datadog-trace -Version: 0.90.0 +Version: 0.91.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # extension is dual-licensed under Apache 2.0 or BSD3. # mpack is MIT @@ -50,7 +55,8 @@ BuildRequires: devtoolset-6-toolchain %global dtsprefix devtoolset-6- %endif BuildRequires: make -BuildRequires: cargo >= 1.60 +BuildRequires: cargo >= 1.70 +BuildRequires: rust >= 1.70 BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-devel < 8.3 @@ -66,7 +72,6 @@ BuildRequires: %{?scl_prefix}php-posix Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Requires: %{?scl_prefix}php-json%{?_isa} %if "%{php_version}" > "8.0" Requires: %{?scl_prefix}php-curl%{?_isa} @@ -107,6 +112,7 @@ if test "x${extver}" != "x%{version}"; then : Error: Upstream extension version is ${extver}, expecting %{version}. exit 1 fi +cd .. : Create cargo configuration to use vendor directory mkdir .cargo @@ -126,9 +132,8 @@ verbose = true replace-with = "vendored-sources" [source.vendored-sources] -directory = "$(dirname $PWD)/mycargo" +directory = "$PWD/mycargo" EOF -cd .. : Required rust version grep -h rust-version mycargo/*/Cargo.toml | sort -u | tail -n 8 @@ -215,6 +220,9 @@ rm tests/ext/sandbox/fatal_errors_are_tracked_005.phpt find tests/ -type f -exec grep -q -- '--XFAIL--' {} \; -delete -print # https://github.com/DataDog/dd-trace-php/issues/2115 rm -r tests/ext/telemetry +# https://github.com/DataDog/dd-trace-php/issues/2248 +rm tests/ext/force_flush_traces.phpt +rm tests/ext/sandbox/fatal_errors_ignored_in_tracing_closure.phpt # DEP for ext dependencies, MOD for ext used in tests DEP="" @@ -285,6 +293,10 @@ fi %changelog +* Thu Sep 7 2023 Remi Collet <remi@remirepo.net> - 0.91.0-1 +- update to 0.91.0 +- raise build dependency on rust 1.70 + * Mon Jul 17 2023 Remi Collet <remi@remirepo.net> - 0.90.0-1 - update to 0.90.0 - build out of sources tree |