summaryrefslogtreecommitdiff
path: root/dev-lang/php/files
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2016-09-30 10:22:37 -0400
committerMichael Orlitzky <mjo@gentoo.org>2016-09-30 11:05:12 -0400
commit523dcfa9e646dacf81f8e43bb9f1262bff211473 (patch)
treea739a68a2d34396048f19b54487a78208aa2a01c /dev-lang/php/files
parentdd1e1faf14f5459104d2f0f2e1f764f65f50afd0 (diff)
downloadgentoo-523dcfa9e646dacf81f8e43bb9f1262bff211473.tar.gz
gentoo-523dcfa9e646dacf81f8e43bb9f1262bff211473.tar.xz
dev-lang/php: new 5.6 and 7.0 revisions with bison dependencies.
The PHP build system checks for the presence of bison (even if it will not be needed), and it emits a warning if an appropriate version is not found. In the 7.0.x series, this is easy to address by simply adding a newish version of bison to DEPEND. In the 5.6.x series, however, there is a bug in the bison version check. A warning is emitted even when a suitable version of bison (>= 3.0.1) is present on the system. So in that series, we have added >=sys-devel/bison-3.0.1 to DEPEND, but also added a new patch. The patch disables the buggy bison version check, eliminating the warning. There should be no danger in doing so now that a newer bison is in DEPEND. Gentoo-Bug: 593278 Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-lang/php/files')
-rw-r--r--dev-lang/php/files/php-5.6-no-bison-warnings.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-lang/php/files/php-5.6-no-bison-warnings.patch b/dev-lang/php/files/php-5.6-no-bison-warnings.patch
new file mode 100644
index 00000000000..18966599596
--- /dev/null
+++ b/dev-lang/php/files/php-5.6-no-bison-warnings.patch
@@ -0,0 +1,42 @@
+From d3466a04345b31dfc62d94fe994b40321a6418ec Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 29 Sep 2016 15:43:06 -0400
+Subject: [PATCH 1/1] Zend/acinclude.m4: don't warn about >=bison-3.0.1
+ versions.
+
+The PHP configure script will emit a warning if it thinks your bison
+version is insufficient:
+
+ WARNING: This bison version is not supported for regeneration of
+ the Zend/PHP parsers (found: 3.0, min: 204, excluded: 3.0).
+
+However, there is an error in the test that causes it to treat all
+3.0.x versions as if they were 3.0. The result is that users get
+warned about a perfectly acceptable version of bison.
+
+This patch is meant only for Gentoo, where we can require a working
+version of bison (something newer than 3.0.1). Having done so, this
+patch removes the check and the WARNING.
+
+Gentoo-Bug: 593278
+PHP-Bug: 69055
+---
+ Zend/acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
+index 7fa8c99..9d6cb1d 100644
+--- a/Zend/acinclude.m4
++++ b/Zend/acinclude.m4
+@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
+ # non-working versions, e.g. "3.0 3.2";
+ # remove "none" when introducing the first incompatible bison version an
+ # separate any following additions by spaces
+- bison_version_exclude="3.0"
++ bison_version_exclude=""
+
+ # for standalone build of Zend Engine
+ test -z "$SED" && SED=sed
+--
+2.7.3
+