Re: [PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4
On Wed, 2013-07-03 at 13:07 +0200, Johannes Schlüter wrote: > The 5.3 branch is closed. Do we really need this here? Additionally I got merge conflicts due to this while merging 5.4 into 5.5, please verify the result there. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4
The 5.3 branch is closed. Do we really need this here? On Wed, 2013-07-03 at 04:36 +, Sebastian Bergmann wrote: > Commit:50ac53e1b109795e3abb92735a3a35cebcdd47a7 > Author:Sebastian Bergmann Wed, 3 Jul > 2013 06:36:54 +0200 > Parents: e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6 > Branches: PHP-5.3 > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=50ac53e1b109795e3abb92735a3a35cebcdd47a7 > > Log: > Add bison 2.6.4 to the list of supported versions > > Changed paths: > M Zend/acinclude.m4 > > > Diff: > diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 > index 136d2d8..77430ab 100644 > --- a/Zend/acinclude.m4 > +++ b/Zend/acinclude.m4 > @@ -4,7 +4,7 @@ dnl This file contains local autoconf functions. > > AC_DEFUN([LIBZEND_BISON_CHECK],[ ># we only support certain bison versions > - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 > 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" > + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 > 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4" > ># for standalone build of Zend Engine >test -z "$SED" && SED=sed > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Add bison 2.6.4 to the list of supported versions: Zend/acinclude.m4
Commit:50ac53e1b109795e3abb92735a3a35cebcdd47a7 Author:Sebastian Bergmann Wed, 3 Jul 2013 06:36:54 +0200 Parents: e4ee921b7ea7f549b6cc2ed29797a7f7f17962c6 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=50ac53e1b109795e3abb92735a3a35cebcdd47a7 Log: Add bison 2.6.4 to the list of supported versions Changed paths: M Zend/acinclude.m4 Diff: diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index 136d2d8..77430ab 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -4,7 +4,7 @@ dnl This file contains local autoconf functions. AC_DEFUN([LIBZEND_BISON_CHECK],[ # we only support certain bison versions - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4" # for standalone build of Zend Engine test -z "$SED" && SED=sed -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
