Skip to content

Commit 26d4b0e

Browse files
authored
Merge pull request #2337 from hzeller/feature-20250119-no-vlog-worry
Don't complain about vlog layering check in newer abseil.
2 parents 3742532 + 32abb43 commit 26d4b0e

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

MODULE.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ bazel_dep(name = "rules_bison", version = "0.3")
1818
# abseil-cpp and googletest can not be updated beyond the following currently,
1919
# as newer googletest is not compatible with bazel 6 anymore, and abseil-cpp
2020
# depends on it :( -- to support all active bazel's, we're stuck till EOL bazel6
21+
# See https://github.com/chipsalliance/verible/issues/2336
2122
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True)
2223

2324
bazel_dep(name = "abseil-cpp", version = "20240116.2")

verible/common/formatting/BUILD

+3
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ cc_library(
133133
"layout-optimizer-internal.h",
134134
],
135135
hdrs = ["layout-optimizer.h"],
136+
# Can only add @abseil-cpp//absl/log:vlog_is_on after > absl 20240116
137+
# https://github.com/chipsalliance/verible/issues/2336
138+
features = ["-layering_check"],
136139
deps = [
137140
":basic-format-style",
138141
":format-token",

verible/verilog/analysis/BUILD

+6
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ cc_library(
164164
"verilog-analyzer.h",
165165
"verilog-excerpt-parse.h",
166166
],
167+
# Can only add @abseil-cpp//absl/log:vlog_is_on after > absl 20240116
168+
# https://github.com/chipsalliance/verible/issues/2336
169+
features = ["-layering_check"],
167170
deps = [
168171
"//verible/common/analysis:file-analyzer",
169172
"//verible/common/lexer:token-stream-adapter",
@@ -241,6 +244,9 @@ cc_library(
241244
name = "verilog-linter",
242245
srcs = ["verilog-linter.cc"],
243246
hdrs = ["verilog-linter.h"],
247+
# Can only add @abseil-cpp//absl/log:vlog_is_on after > absl 20240116
248+
# https://github.com/chipsalliance/verible/issues/2336
249+
features = ["-layering_check"],
244250
deps = [
245251
":default-rules",
246252
":lint-rule-registry",

verible/verilog/tools/ls/BUILD

+3
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@ cc_library(
167167
name = "symbol-table-handler",
168168
srcs = ["symbol-table-handler.cc"],
169169
hdrs = ["symbol-table-handler.h"],
170+
# Can only add @abseil-cpp//absl/log:vlog_is_on after > absl 20240116
171+
# https://github.com/chipsalliance/verible/issues/2336
172+
features = ["-layering_check"],
170173
deps = [
171174
":lsp-conversion",
172175
":lsp-parse-buffer",

0 commit comments

Comments
 (0)