summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-03-09 07:53:17 +0100
committerRemi Collet <fedora@famillecollet.com>2017-03-09 07:53:17 +0100
commit03450e2c036854a0a0ec7ec46baaf093abf56d69 (patch)
treefb7b065fc7b9e0d1a72633b7cb69e7422b567ae8
parentf72eea8b9b4056eb7d1ae6f5075c9d5700170516 (diff)
php-pecl-swoole: add upstream patch, test build, still broken on F26
-rw-r--r--php-pecl-swoole-dev.spec10
1 files changed, 6 insertions, 4 deletions
diff --git a/php-pecl-swoole-dev.spec b/php-pecl-swoole-dev.spec
index 12d87cc..849ca50 100644
--- a/php-pecl-swoole-dev.spec
+++ b/php-pecl-swoole-dev.spec
@@ -37,6 +37,8 @@ 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
+
BuildRequires: %{?scl_prefix}php-devel >= 5.5
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-sockets
@@ -132,9 +134,7 @@ sed -e 's/role="test"/role="src"/' \
cd NTS
-%if 0%{?fedora} >= 26
-sed -e 's/SSL_library_init/OPENSSL_init_ssl/' -i config.m4
-%endif
+%patch0 -p1 -b .upstream
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_SWOOLE_VERSION/{s/.* "//;s/".*$//;p}' php_swoole.h)
@@ -181,6 +181,7 @@ peclbuild() {
--enable-thread \
--enable-mysqlnd \
--enable-coroutine \
+ --with-libdir=%{_lib} \
--with-php-config=$1
make %{?_smp_mflags}
@@ -278,7 +279,8 @@ cd ../ZTS
%changelog
* Mon Mar 6 2017 Remi Collet <remi@remirepo.net> - 2.0.6-3
-- open https://github.com/swoole/swoole-src/issues/1118
+- add upstream patch for
+ https://github.com/swoole/swoole-src/issues/1118
- open https://github.com/swoole/swoole-src/issues/1119
* Fri Feb 24 2017 Remi Collet <remi@remirepo.net> - 2.0.6-2