Browse Source

Update bison version in conan in yexport

ignat 1 year ago
parent
commit
3f450d2fb5
2 changed files with 2 additions and 2 deletions
  1. 1 1
      build/conf/bison_lex.conf
  2. 1 1
      conanfile.txt

+ 1 - 1
build/conf/bison_lex.conf

@@ -122,7 +122,7 @@ macro USE_OLD_FLEX() {
 
 macro _SRC("y", SRC, SRCFLAGS...) {
     .CMD=${tool:"contrib/tools/bison/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
-    .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.5.3 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"'
+    .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"'
 }
 
 macro _SRC("ypp", SRC, SRCFLAGS...) {

+ 1 - 1
conanfile.txt

@@ -5,7 +5,7 @@ openssl/1.1.1s
 zlib/1.2.13
 
 [tool_requires]
-bison/3.5.3
+bison/3.8.2
 m4/1.4.19
 ragel/6.10
 yasm/1.3.0