Permalink
Browse files

FL-469: add missing patches to php

  • Loading branch information...
1 parent c5b1aea commit 055044d3365faa3ab57fb862b17b114d5ff32010 @angryvincent angryvincent committed Mar 27, 2013
@@ -0,0 +1,16 @@
+--- ./Zend/acinclude.m4 2013-03-20 15:09:27.000000000 +0100
++++ ./Zend/acinclude.m4.new 2013-03-25 21:35:27.654016588 +0100
+@@ -17,12 +17,7 @@
+ if test -n "$bison_version_vars"; then
+ set $bison_version_vars
+ bison_version="${1}.${2}"
+- for bison_check_version in $bison_version_list; do
+- if test "$bison_version" = "$bison_check_version"; then
+- php_cv_bison_version="$bison_check_version (ok)"
+- break
+- fi
+- done
++ php_cv_bison_version="$bison_version (ok)"
+ fi
+ ])
+ fi
@@ -0,0 +1,29 @@
+diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
+index ccbc9b1..6a9a24a 100644
+--- a/Zend/zend_language_parser.y
++++ b/Zend/zend_language_parser.y
+@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
+
+ #define YYERROR_VERBOSE
+ #define YYSTYPE znode
+-#ifdef ZTS
+-# define YYPARSE_PARAM tsrm_ls
+-# define YYLEX_PARAM tsrm_ls
+-#endif
+-
+
+ %}
+
+ %pure_parser
+ %expect 3
+
++%code requires {
++#ifdef ZTS
++# define YYPARSE_PARAM tsrm_ls
++# define YYLEX_PARAM tsrm_ls
++#endif
++}
++
+ %token END 0 "end of file"
+ %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
+ %token T_INCLUDE "include (T_INCLUDE)"
@@ -0,0 +1,14 @@
+--- acinclude.m4 2012-11-17 21:53:06.346408695 +0100
++++ acinclude.m4.new 2013-03-18 11:37:09.253432820 +0100
+@@ -2331,8 +2331,10 @@
+ AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
+ fi
+
+- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
++ if test -n "$OPENSSL_LIBS" ; then
+ PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
++ fi
++ if test -n "$OPENSSL_INCS" ; then
+ PHP_EVAL_INCLINE($OPENSSL_INCS)
+ fi
+ fi
Oops, something went wrong.

0 comments on commit 055044d

Please sign in to comment.