aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorignat <ignat@yandex-team.com>2023-08-08 09:34:16 +0300
committerignat <ignat@yandex-team.com>2023-08-08 10:15:39 +0300
commit3f450d2fb597681b15b0848b7cccfaa899143a8c (patch)
tree678f0aa29559d5e0c0562545f5151b55ca6e8b46
parent080a5f104252f786472c54d94142a871146fd8b3 (diff)
downloadydb-3f450d2fb597681b15b0848b7cccfaa899143a8c.tar.gz
Update bison version in conan in yexport
-rw-r--r--build/conf/bison_lex.conf2
-rw-r--r--conanfile.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf
index 9e195c71388..92cdc277080 100644
--- a/build/conf/bison_lex.conf
+++ b/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...) {
diff --git a/conanfile.txt b/conanfile.txt
index fe9e256d412..3c0c6f7350f 100644
--- a/conanfile.txt
+++ b/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