Skip to content

Commit 9979948

Browse files
authored
Merge pull request The-OpenROAD-Project#9474 from hzeller/feature-20260212-use-abc-from-bcr
Use abc from BCR instead of third-party/
2 parents b848e68 + a357a2f commit 9979948

File tree

10 files changed

+20
-14
lines changed

10 files changed

+20
-14
lines changed

.bazelignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ build/
22
debug/
33
src/sta/build/
44
src/sta/debug/
5+
# we use abc from MODULE.bazel
6+
third-party/abc/

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ OPENROAD_LIBRARY_DEPS = [
123123
"//src/upf:ui",
124124
"//src/utl",
125125
"//src/utl:ui",
126-
"//third-party/abc:abc-lib",
126+
"@abc",
127127
":ord",
128128
] + select(
129129
{

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module(
55
name = "openroad",
66
)
77

8+
bazel_dep(name = "abc", version = "0.62-yosyshq")
89
bazel_dep(name = "platforms", version = "0.0.11")
910
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1011
bazel_dep(name = "rules_cc", version = "0.1.2")

MODULE.bazel.lock

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WORKSPACE

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ http_archive(
2525
# This essentially reads as a TODO list of what needs to be upstreamed to BCR
2626
load("@rules_hdl//dependency_support/com_github_quantamhd_lemon:com_github_quantamhd_lemon.bzl", "com_github_quantamhd_lemon")
2727
load("@rules_hdl//dependency_support/com_github_westes_flex:com_github_westes_flex.bzl", "com_github_westes_flex")
28-
load("@rules_hdl//dependency_support/net_invisible_island_ncurses:net_invisible_island_ncurses.bzl", "net_invisible_island_ncurses")
2928
load("@rules_hdl//dependency_support/net_zlib:net_zlib.bzl", "net_zlib")
3029
load("@rules_hdl//dependency_support/org_gnu_bison:org_gnu_bison.bzl", "org_gnu_bison")
31-
load("@rules_hdl//dependency_support/org_gnu_readline:org_gnu_readline.bzl", "org_gnu_readline")
3230
load("@rules_hdl//dependency_support/org_pcre_ftp:org_pcre_ftp.bzl", "org_pcre_ftp")
3331
load("@rules_hdl//dependency_support/org_swig:org_swig.bzl", "org_swig")
3432
load("@rules_hdl//dependency_support/tk_tcl:tk_tcl.bzl", "tk_tcl")
@@ -48,12 +46,7 @@ com_github_westes_flex()
4846

4947
org_gnu_bison()
5048

51-
# secondary dependencies of the above libraries. Some of these are already
52-
# in BCR with different name or sligtly newer API version.
53-
net_invisible_island_ncurses()
54-
49+
# remaining user is tcl. Once we can get that from BCR, this can go.
5550
net_zlib() # BCR has @zlib we use, but some above dep uses it w/ differet name
5651

57-
org_gnu_readline()
58-
5952
org_pcre_ftp() # there is a newer pcre2 in BCR

src/cgt/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ cc_library(
4141
"//src/odb",
4242
"//src/sta:opensta_lib",
4343
"//src/utl",
44-
"//third-party/abc:abc-lib",
44+
"@abc",
4545
"@boost.stacktrace",
4646
"@tk_tcl//:tcl",
4747
],

src/cut/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cc_library(
3737
"//src/rsz",
3838
"//src/sta:opensta_lib",
3939
"//src/utl",
40-
"//third-party/abc:abc-lib",
40+
"@abc",
4141
"@boost.bind",
4242
"@boost.config",
4343
"@boost.fusion",

src/cut/test/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cc_test(
3737
"//src/sta:opensta_lib",
3838
"//src/tst",
3939
"//src/utl",
40-
"//third-party/abc:abc-lib",
40+
"@abc",
4141
"@googletest//:gtest",
4242
"@googletest//:gtest_main",
4343
],

src/rmp/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cc_library(
4444
"//src/rsz",
4545
"//src/sta:opensta_lib",
4646
"//src/utl",
47-
"//third-party/abc:abc-lib",
47+
"@abc",
4848
"@boost.bind",
4949
"@boost.config",
5050
"@boost.fusion",

src/rmp/test/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ cc_test(
155155
"//src/sta:opensta_lib",
156156
"//src/tst",
157157
"//src/utl",
158-
"//third-party/abc:abc-lib",
158+
"@abc",
159159
"@googletest//:gtest",
160160
"@googletest//:gtest_main",
161161
"@tk_tcl//:tcl",

0 commit comments

Comments
 (0)