1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using the -t command line to bison instead of %name-prefix

Browse Source 
Needed to compile on machines with older bison versions.
Adding a new parameter "name_prefix" to RUN_BISON() cmake macro.
This commit is contained in:
Alexander Barkov 2017-04-06 20:58:12 +04:00
parent 191f262600
commit 75d1962a24
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/bison.cmake
View File

@ -40,7 +40,7 @@ ELSEIF(BISON_EXECUTABLE AND NOT BISON_USABLE)
ENDIF() ENDIF()
# Use bison to generate C++ and header file # Use bison to generate C++ and header file
MACRO (RUN_BISON input_yy output_cc output_h) MACRO (RUN_BISON input_yy output_cc output_h name_prefix)
IF(BISON_TOO_OLD) IF(BISON_TOO_OLD)
IF(EXISTS ${output_cc} AND EXISTS ${output_h}) IF(EXISTS ${output_cc} AND EXISTS ${output_h})
SET(BISON_USABLE FALSE) SET(BISON_USABLE FALSE)
@ -50,7 +50,7 @@ MACRO (RUN_BISON input_yy output_cc output_h)
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${output_cc} OUTPUT ${output_cc}
${output_h} ${output_h}
COMMAND ${BISON_EXECUTABLE} -y COMMAND ${BISON_EXECUTABLE} -y -p ${name_prefix}
--output=${output_cc} --output=${output_cc}
--defines=${output_h} --defines=${output_h}
${input_yy} ${input_yy}

2
sql/CMakeLists.txt
View File

@ -279,12 +279,14 @@ RUN_BISON(
${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy ${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h
MYSQL
) )
RUN_BISON( RUN_BISON(
${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc_ora.yy ${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc_ora.yy
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.h ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.h
ORA
) )
# Gen_lex_hash # Gen_lex_hash

1
sql/sql_yacc.yy
View File

@ -852,7 +852,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%} %}
%pure-parser /* We have threads */ %pure-parser /* We have threads */
%name-prefix "MYSQL"
%parse-param { THD *thd } %parse-param { THD *thd }
%lex-param { THD *thd } %lex-param { THD *thd }
/* /*

1
sql/sql_yacc_ora.yy
View File

@ -270,7 +270,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%} %}
%pure-parser /* We have threads */ %pure-parser /* We have threads */
%name-prefix "ORA"
%parse-param { THD *thd } %parse-param { THD *thd }
%lex-param { THD *thd } %lex-param { THD *thd }
/* /*