From 365913a04302f6fb65bc6ebe02058573c1d81f3e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Dec 2015 10:15:06 +0100 Subject: add upstream patch for i386 --- php-pecl-pthreads-php7.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'php-pecl-pthreads-php7.spec') diff --git a/php-pecl-pthreads-php7.spec b/php-pecl-pthreads-php7.spec index f10a0ea..f527085 100644 --- a/php-pecl-pthreads-php7.spec +++ b/php-pecl-pthreads-php7.spec @@ -17,12 +17,14 @@ Summary: Threading API Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 3.1.4 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: %{pecl_name}-upstream.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-zts-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -74,6 +76,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO sed -e 's/role="test"/role="src"/' -i package.xml cd %{pecl_name}-%{version} +%patch0 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_PTHREADS_VERSION/{s/.* "//;s/".*$//;p}' php_pthreads.h) @@ -139,10 +142,6 @@ fi %check cd %{pecl_name}-%{version} -%ifnarch x86_64 -# https://github.com/krakjoe/pthreads/issues/523 -rm tests/return-types.phpt -%endif : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ @@ -172,6 +171,10 @@ rm -rf %{buildroot} %changelog +* Wed Dec 2 2015 Remi Collet - 3.1.4-2 +- add upstream patch to fix segfault on i386 + https://github.com/krakjoe/pthreads/issues/523 + * Wed Dec 2 2015 Remi Collet - 3.1.4-1 - Update to 3.1.4 (stable) -- cgit