summaryrefslogtreecommitdiffstats
path: root/unit-php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-17 09:22:18 +0200
committerRemi Collet <remi@remirepo.net>2020-04-17 09:22:18 +0200
commit60b25188efaf2ae2b8d240b94148c52985b6ec27 (patch)
treedc23b2e4c435cf0b1a41f38f5e92a5b63be599ad /unit-php.spec
parenta7dd53d0cf587c465bf34e56acc14626da89c600 (diff)
fix build with PHP 8 using patches from
https://github.com/nginx/unit/pull/425
Diffstat (limited to 'unit-php.spec')
-rw-r--r--unit-php.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/unit-php.spec b/unit-php.spec
index 0d60ba0..647766c 100644
--- a/unit-php.spec
+++ b/unit-php.spec
@@ -35,13 +35,16 @@ Requires: %{scl_prefix}php-embedded
Name: %{?scl_prefix}%{project}-php
Version: 1.17.0
-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;')}}
Summary: PHP module for NGINX Unit
License: ASL 2.0
URL: https://unit.nginx.org/
Source0: https://github.com/%{gh_owner}/%{project}/archive/%{gh_commit}/%{project}-%{version}-%{gh_short}.tar.gz
+Patch0: 0001-fix-lib-name-for-PHP-8.patch
+Patch1: 0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch
+
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-embedded
@@ -60,6 +63,8 @@ and NGINX unit %{version}.
%prep
%setup -qn %{project}-%{gh_commit}
+%patch0 -p1
+%patch1 -p1
%build
@@ -118,6 +123,10 @@ make %{modname}-install DESTDIR=%{buildroot}
%changelog
+* Fri Apr 17 2020 Remi Collet <remi@remirepo.net> - 1.17.0-2
+- fix build with PHP 8 using patches from
+ https://github.com/nginx/unit/pull/425
+
* Fri Apr 17 2020 Remi Collet <remi@remirepo.net> - 1.17.0-1
- update to 1.17.0