diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-09-20 11:22:51 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-09-20 11:51:54 +0300 |
| commit | 2008d46b80a748ace789e479105470b820793af7 (patch) | |
| tree | 75e33657c00f84baf2a69ac447c3fc7ee8f0f3c3 /build | |
| parent | f5b051f5e09f00265229985ba5fd47aa5c8959ff (diff) | |
| download | ydb-2008d46b80a748ace789e479105470b820793af7.tar.gz | |
Proofread licenses for contrib/tools/bison
And mark `GPL-3.0-or-later WITH Bison-exception-2.2` as it reads as follows:
```
As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
under terms of your choice, so long as that work isn't itself a
parser generator using the skeleton or a modified version thereof
as a parser skeleton.
```
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/bison_lex.conf | 2 | ||||
| -rw-r--r-- | build/conf/license.conf | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf index 92cdc277080..0e254860547 100644 --- a/build/conf/bison_lex.conf +++ b/build/conf/bison_lex.conf @@ -121,11 +121,13 @@ macro USE_OLD_FLEX() { } macro _SRC("y", SRC, SRCFLAGS...) { + .PEERDIR=contrib/tools/bison/bison/induced .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.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' } macro _SRC("ypp", SRC, SRCFLAGS...) { + .PEERDIR=contrib/tools/bison/bison/induced .CMD=$_SRC(y $SRC $SRCFLAGS) .SEM=$_SRC(y $SRC $SRCFLAGS) } diff --git a/build/conf/license.conf b/build/conf/license.conf index 1fc58158dda..51e9571961d 100644 --- a/build/conf/license.conf +++ b/build/conf/license.conf @@ -219,7 +219,6 @@ LICENSES_REQUIRE_DISCLOSURE= \ GPL-3.0-only \ GPL-3.0-only WITH Bison-exception-2.2 \ GPL-3.0-or-later \ - GPL-3.0-or-later WITH Bison-exception-2.2 \ GPLv2+ LICENSES_REQUIRE_DISCLOSURE_STATIC= \ @@ -285,6 +284,7 @@ LICENSES_PERMISSIVE= \ FSFAP \ FTL \ GPL-2.0-only WITH Classpath-exception-2.0 \ + GPL-3.0-or-later WITH Bison-exception-2.2 \ H2 \ IBM-pibs \ ICU \ |