com php-src: Fix bug #76030 RE2C_FLAGS rarely honoured : ext/json/Makefile.frag ext/pdo/Makefile.frag ext/ phar/Makefile.frag
ext/standard/Makefile.frag

Commit: e0fe667421bfd49d25f0052d873cef7c344ebb74 Author: Cristian Rodríguez <crrodriguez@opensuse.org> Sun, 5 Aug 2018 16:07:01 +0200 Committer: Peter Kokot <peterkokot@gmail.com> Sun, 12 Aug 2018 11:15:18 +0200 Parents: 3cef5a2476176ce32e22eb49091718489f4f8872 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e0fe667421bfd49d25f0052d873cef7c344ebb74 Log: Fix bug #76030 RE2C_FLAGS rarely honoured Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build systems there is also optional configure option --enable-re2c-cgoto which enables optimized conditional jumps using non-standard computed goto extension. It is available since RE2C 0.10.3 so it's well covered by RE2C versions PHP uses. This patch syncs usage of -g option accross the PHP Unix-alike build system. Bugs: https://bugs.php.net/76030 Changed paths: M ext/json/Makefile.frag M ext/pdo/Makefile.frag M ext/phar/Makefile.frag M ext/standard/Makefile.frag Diff: diff --git a/ext/json/Makefile.frag b/ext/json/Makefile.frag index cb26aca..d35abfc 100644 --- a/ext/json/Makefile.frag +++ b/ext/json/Makefile.frag @@ -1,5 +1,5 @@ $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re - $(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re + $(RE2C) $(RE2C_FLAGS) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y $(YACC) --defines -l $(srcdir)/json_parser.y -o $@ diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index d2b5974..698699b 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -9,9 +9,9 @@ PDO_HEADER_FILES= \ $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re @(cd $(top_srcdir); \ if test -f ./pdo_sql_parser.re; then \ - $(RE2C) --no-generation-date -o pdo_sql_parser.c pdo_sql_parser.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -o pdo_sql_parser.c pdo_sql_parser.re; \ else \ - $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re; \ fi) install-pdo-headers: diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index 0e3713f..e1dda15 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -1,9 +1,9 @@ $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re @(cd $(top_srcdir); \ if test -f ../php_phar.h; then \ - $(RE2C) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \ else \ - $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \ + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \ fi) pharcmd: $(builddir)/phar.php $(builddir)/phar.phar diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag index 8b6e3e2..2cc75ca 100644 --- a/ext/standard/Makefile.frag +++ b/ext/standard/Makefile.frag @@ -1,9 +1,9 @@ $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re - @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re) + @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re) $(builddir)/info.lo: $(builddir)/../../main/build-defs.h