diff options
| author | Remi Collet <remi@remirepo.net> | 2024-11-15 07:50:03 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-11-15 07:50:03 +0100 |
| commit | 0f143ca919932f9e3dfb08bc3273481368b5a158 (patch) | |
| tree | 5692ca65e824391d9ae1c3d4c013f2578e5ef6c8 | |
| parent | 1703d733b837f81edf22897ecde3dfe918c668c5 (diff) | |
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-excimer.spec | 31 |
3 files changed, 20 insertions, 15 deletions
@@ -2,7 +2,7 @@ excimer excimer support => enabled -excimer version => 1.2.1 +excimer version => 1.2.3 Directive => Local Value => Master Value excimer.default_max_depth => 1000 => 1000 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #96 excimer version 1.2.1 ] { +Extension [ <persistent> extension #126 excimer version 1.2.3 ] { - Dependencies { } diff --git a/php-pecl-excimer.spec b/php-pecl-excimer.spec index eaf33df..f02a0e1 100644 --- a/php-pecl-excimer.spec +++ b/php-pecl-excimer.spec @@ -20,7 +20,7 @@ Summary: Interrupting timer and low-overhead sampling profiler Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} @@ -85,13 +85,16 @@ EOF cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --enable-excimer \ --with-libdir=%{_lib} \ --with-php-config=%{__phpconfig} -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -99,15 +102,15 @@ cd ../ZTS --enable-excimer \ --with-libdir=%{_lib} \ --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} + +%make_build %endif %install %{?dtsenable} -make -C NTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C NTS # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} @@ -116,8 +119,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml %if %{with_zts} -make -C ZTS \ - install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -132,6 +134,9 @@ done cd %{sources} # erratic results, randomly fails in mock rm tests/cpu.phpt +if [ $(%{__php} -r 'echo PHP_VERSION_ID;') -ge 80400 ]; then +rm tests/maxDepth.phpt +fi OPT="-q -P --show-diff" %if "%{php_version}" > "7.4" @@ -154,12 +159,6 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so" \ %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' - -%if %{with tests} -# Upstream test suite for ZTS extension -TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ -%{__ztsphp} -n run-tests.php $OPT -%endif %endif @@ -178,6 +177,12 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Fri Nov 15 2024 Remi Collet <remi@remirepo.net> - 1.2.3-1 +- update to 1.2.3 + +* Tue Oct 1 2024 Remi Collet <remi@remirepo.net> - 1.2.2-2 +- ignore 1 test failing with 8.4 + * Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 1.2.2-1 - update to 1.2.2 - drop patch merged upstream |