aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexeyantipov <alexeyantipov@yandex-team.com>2023-09-21 17:37:20 +0300
committeralexeyantipov <alexeyantipov@yandex-team.com>2023-09-21 18:26:01 +0300
commit9fd8a920b379d2c36cea6e760cdb04433eb6b996 (patch)
tree3da73957e76b9dace5176c95af67d46ec9f9a2dc
parent44a989845eb33898188bdb65e86926bf43ce083e (diff)
downloadydb-9fd8a920b379d2c36cea6e760cdb04433eb6b996.tar.gz
Revert "Put contrib/libs/glslang under yamaker"
This reverts commit c590201dd40542502dc7be35b6c9d1147c660d12 (PR: 4539150), reversing changes made to a99748ae396f33dd311975f12e8eda2b056fa0ef.
-rw-r--r--build/conf/license.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf
index 7be91dfe865..51e9571961d 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -217,6 +217,7 @@ LICENSES_REQUIRE_DISCLOSURE= \
GPL-2.0-or-later WITH GCC-exception-2.0 \
GPL-2.0-or-later WITH Linux-syscall-note \
GPL-3.0-only \
+ GPL-3.0-only WITH Bison-exception-2.2 \
GPL-3.0-or-later \
GPLv2+
@@ -283,7 +284,6 @@ LICENSES_PERMISSIVE= \
FSFAP \
FTL \
GPL-2.0-only WITH Classpath-exception-2.0 \
- GPL-3.0-only WITH Bison-exception-2.2 \
GPL-3.0-or-later WITH Bison-exception-2.2 \
H2 \
IBM-pibs \