diff options
Diffstat (limited to 'php-pecl-yaf.spec')
| -rw-r--r-- | php-pecl-yaf.spec | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index 50109f8..3600747 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -24,13 +24,15 @@ Summary: Yet Another Framework Name: %{?scl_prefix}php-pecl-yaf Version: 3.3.6 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 URL: https://pecl.php.net/package/yaf Source0: https://pecl.php.net/get/%{sources}%{?prever}.tgz Source1: %{pecl_name}.ini Patch0: %{pecl_name}-upstream.patch +Patch1: 0001-remove-trailing-space.patch +Patch2: 0002-relax-test-expectations-for-8.4.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -66,6 +68,8 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h ) @@ -84,17 +88,21 @@ mkdir ZTS %build %{?dtsenable} +export CFLAGS="%{optflags} -Wno-duplicate-decl-specifier" + cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure --with-php-config=%{__phpconfig} -make %{?_smp_mflags} +%make_build %if %{with_zts} cd ../ZTS %configure --with-php-config=%{__ztsphpconfig} -make %{?_smp_mflags} +%make_build %endif @@ -102,12 +110,12 @@ make %{?_smp_mflags} %{?dtsenable} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} # Install the ZTS stuff %if %{with_zts} -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -145,14 +153,6 @@ REPORT_EXIT_STATUS=1 \ %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' - -%if %{with tests} -: Upstream test suite for NTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="$OPTS -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php -q --show-diff -%endif %endif @@ -171,6 +171,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Oct 1 2024 Remi Collet <remi@remirepo.net> - 3.3.6-3 +- fix PHP 8.4 build using patch from + https://github.com/laruence/yaf/pull/594 + * Wed Jul 10 2024 Remi Collet <remi@remirepo.net> - 3.3.6-2 - add upstream patch for PHP 8.4 |