From 45fae571e24c128a415fcfa7939a5c5f9fb2d339 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 26 May 2019 10:09:13 +0300 Subject: [PATCH] requires bison 3.0.0 now --- php-shared.patch | 12 ++++++------ php.spec | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/php-shared.patch b/php-shared.patch index 9b426c2..0768faa 100644 --- a/php-shared.patch +++ b/php-shared.patch @@ -1,15 +1,15 @@ ---- php-7.0.0RC3/configure.ac~ 2015-09-26 14:55:35.000000000 +0300 -+++ php-7.0.0RC3/configure.ac 2015-09-26 15:13:29.581882625 +0300 -@@ -224,6 +224,9 @@ - dnl check for -R, etc. switch +--- php-src-PHP-7.4/configure.ac~ 2019-05-25 12:37:30.000000000 +0300 ++++ php-src-PHP-7.4/configure.ac 2019-05-26 10:07:36.385580763 +0300 +@@ -202,6 +202,9 @@ + dnl Check for -R, etc. switch. PHP_RUNPATH_SWITCH +dnl Always shared +PHP_BUILD_SHARED + - dnl Checks for some support/generator progs + dnl Checks for some support/generator progs. PHP_PROG_AWK - PHP_PROG_BISON + PHP_PROG_BISON([3.0.0]) --- php-5.2.4/build/Makefile.global~ 2007-08-31 19:13:58.000000000 +0300 +++ php-5.2.4/build/Makefile.global 2007-08-31 19:19:33.799017413 +0300 @@ -13,8 +13,12 @@ diff --git a/php.spec b/php.spec index 4d3dc73..b3eaf0c 100644 --- a/php.spec +++ b/php.spec @@ -168,7 +168,7 @@ Group: Libraries #Source0: https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz #Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz Source0: https://github.com/php/php-src/archive/PHP-7.4/%{orgname}-%{version}.tar.gz -# Source0-md5: e54970ae767eae731995f5bb2b4e0f43 +# Source0-md5: 5ddd943d45880a2fa7389b6fc4aeec3a Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -229,7 +229,7 @@ URL: http://php.net/ %{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0} BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.4d -BuildRequires: bison +BuildRequires: bison >= 3.0.0 BuildRequires: bzip2-devel >= 1.0.0 %{?with_curl:BuildRequires: curl-devel >= 7.15.5} BuildRequires: cyrus-sasl-devel >= 2 -- 2.44.0