Skip to content

Commit a4a8a46

Browse files
committed
MODULE.bazel: Use boost from alternate registry
1 parent d1d2eb8 commit a4a8a46

File tree

5 files changed

+56
-51
lines changed

5 files changed

+56
-51
lines changed

.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# limitations under the License.
1414
common --enable_bzlmod
1515

16+
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
17+
common --registry=https://bcr.bazel.build
18+
1619
build --cxxopt "-std=c++17"
1720
build --cxxopt "-ffp-contract=off"
1821
build --host_cxxopt "-std=c++17"

MODULE.bazel

+19-18
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,30 @@ module(name = "rules_hdl")
1010
bazel_dep(name = "platforms", version = "0.0.11")
1111
bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2", repo_name = "com_google_absl")
1212
bazel_dep(name = "bazel_skylib", version = "1.7.1")
13+
bazel_dep(name = "boost.algorithm", version = "1.83.0.bzl.1")
14+
bazel_dep(name = "boost.asio", version = "1.83.0.bzl.4")
15+
bazel_dep(name = "boost.bind", version = "1.83.0.bzl.1")
16+
bazel_dep(name = "boost.config", version = "1.83.0.bzl.6")
17+
bazel_dep(name = "boost.fusion", version = "1.83.0.bzl.1")
18+
bazel_dep(name = "boost.geometry", version = "1.83.0.bzl.1")
19+
bazel_dep(name = "boost.graph", version = "1.83.0.bzl.1")
20+
bazel_dep(name = "boost.heap", version = "1.83.0.bzl.1")
21+
bazel_dep(name = "boost.icl", version = "1.83.0.bzl.1")
22+
bazel_dep(name = "boost.lambda", version = "1.83.0.bzl.1")
23+
bazel_dep(name = "boost.multi_array", version = "1.83.0.bzl.1")
24+
bazel_dep(name = "boost.optional", version = "1.83.0.bzl.1")
25+
bazel_dep(name = "boost.phoenix", version = "1.83.0.bzl.1")
26+
bazel_dep(name = "boost.polygon", version = "1.83.0.bzl.1")
27+
bazel_dep(name = "boost.property_tree", version = "1.83.0.bzl.1")
28+
bazel_dep(name = "boost.serialization", version = "1.83.0.bzl.3")
29+
bazel_dep(name = "boost.spirit", version = "1.83.0.bzl.2")
30+
bazel_dep(name = "boost.stacktrace", version = "1.83.0.bzl.3")
31+
bazel_dep(name = "boost.thread", version = "1.83.0.bzl.2")
1332
bazel_dep(name = "eigen", version = "3.4.0.bcr.2")
1433
bazel_dep(name = "fmt", version = "11.1.3", repo_name = "com_github_fmtlib_fmt")
1534
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
1635
bazel_dep(name = "protobuf", version = "29.3")
1736
bazel_dep(name = "rules_bison", version = "0.3")
18-
bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost")
1937
bazel_dep(name = "rules_cc", version = "0.1.1")
2038
bazel_dep(name = "rules_flex", version = "0.3")
2139
bazel_dep(name = "rules_java", version = "8.6.3")
@@ -28,20 +46,6 @@ bazel_dep(name = "toolchains_llvm", version = "1.0.0")
2846
bazel_dep(name = "zlib", version = "1.3.1.bcr.4")
2947
bazel_dep(name = "or-tools", version = "9.12", repo_name = "com_google_ortools")
3048

31-
archive_override(
32-
module_name = "rules_boost",
33-
integrity = "sha256-ymGvj87Jfv79f6G4kvOwLtRvBwCgTEqKuLrjb0hoMXs=",
34-
patches = [
35-
"@rules_hdl//dependency_support/boost:boost.BUILD.patch",
36-
"@rules_hdl//dependency_support/boost:libbacktrace.BUILD.patch",
37-
"@rules_hdl//dependency_support/boost:MODULE.bazel.patch",
38-
"@rules_hdl//dependency_support/boost:backtrace-supported.h.patch.patch",
39-
"@rules_hdl//dependency_support/boost:config.h.patch.patch",
40-
],
41-
strip_prefix = "rules_boost-5cdb3c83807d1036bebcc60acf87333e5b3cc856",
42-
urls = ["https://github.com/nelhage/rules_boost/archive/5cdb3c83807d1036bebcc60acf87333e5b3cc856.zip"],
43-
)
44-
4549
archive_override(
4650
module_name = "or-tools",
4751
integrity = "sha256-y7e/7plAn4tXBMQgyaa8wQVJY5UliMGWUdT1uwSA9TQ=",
@@ -59,9 +63,6 @@ _org_gnu_gnulib(
5963
name = "org_gnu_gnulib",
6064
)
6165

62-
non_module_boost_repositories = use_extension("@com_github_nelhage_rules_boost//:boost/repositories.bzl", "non_module_dependencies")
63-
use_repo(non_module_boost_repositories, "boost")
64-
6566
# Configure and register the toolchain.
6667
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
6768
llvm.toolchain(

dependency_support/com_github_yosyshq_nextpnr/bundled.BUILD.bazel

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ FAMILIES = [
3636

3737
DEPS = [
3838
"@at_clifford_yosys//:json11",
39-
"@boost//:filesystem",
40-
"@boost//:iostreams",
41-
"@boost//:program_options",
42-
"@boost//:python",
43-
"@boost//:system",
44-
"@boost//:thread",
39+
"@boost.filesystem",
40+
"@boost.iostreams",
41+
"@boost.program_options",
42+
"@boost.python",
43+
"@boost.system",
44+
"@boost.thread",
4545
"@local_config_python//:python_headers",
4646
"@eigen//:eigen",
4747
]
@@ -103,8 +103,8 @@ cc_binary(
103103
srcs = ["bba/main.cc"],
104104
copts = COPTS,
105105
deps = [
106-
"@boost//:filesystem",
107-
"@boost//:program_options",
106+
"@boost.filesystem",
107+
"@boost.program_options",
108108
],
109109
)
110110

@@ -223,9 +223,9 @@ cc_library(
223223
],
224224
deps = [
225225
":common",
226-
"@boost//:functional",
227-
"@boost//:lexical_cast",
228-
"@boost//:thread",
226+
"@boost.functional",
227+
"@boost.lexical_cast",
228+
"@boost.thread",
229229
],
230230
)
231231

@@ -295,8 +295,8 @@ cc_library(
295295
],
296296
deps = [
297297
":common",
298-
"@boost//:functional",
299-
"@boost//:lexical_cast",
300-
"@boost//:thread",
298+
"@boost.functional",
299+
"@boost.lexical_cast",
300+
"@boost.thread",
301301
],
302302
)

dependency_support/org_theopenroadproject/build_helper.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,16 @@ OPENROAD_LIBRARY_DEPS = [
289289
"@com_google_absl//absl/flags:flag",
290290
"@com_google_absl//absl/strings",
291291
"@com_google_absl//absl/types:span",
292-
"@boost//:asio",
293-
"@boost//:geometry",
294-
"@boost//:graph",
295-
"@boost//:heap",
296-
"@boost//:icl",
297-
"@boost//:multi_array",
298-
"@boost//:polygon",
299-
"@boost//:property_tree",
300-
"@boost//:stacktrace",
301-
"@boost//:thread",
292+
"@boost.asio",
293+
"@boost.geometry",
294+
"@boost.graph",
295+
"@boost.heap",
296+
"@boost.icl",
297+
"@boost.multi_array",
298+
"@boost.polygon",
299+
"@boost.property_tree",
300+
"@boost.stacktrace",
301+
"@boost.thread",
302302
"@eigen//:eigen",
303303
"@com_github_quantamhd_lemon//:lemon",
304304
"@org_llvm_openmp//:openmp",

dependency_support/org_theopenroadproject/bundled.BUILD.bazel

+10-9
Original file line numberDiff line numberDiff line change
@@ -1011,15 +1011,16 @@ cc_library(
10111011
":logger",
10121012
":opendb_def",
10131013
":opendb_lef",
1014-
"@boost//:algorithm",
1015-
"@boost//:bind",
1016-
"@boost//:config",
1017-
"@boost//:fusion",
1018-
"@boost//:lambda",
1019-
"@boost//:optional",
1020-
"@boost//:phoenix",
1021-
"@boost//:polygon",
1022-
"@boost//:spirit",
1014+
"@boost.algorithm",
1015+
"@boost.bind",
1016+
"@boost.config",
1017+
"@boost.fusion",
1018+
"@boost.lambda",
1019+
"@boost.optional",
1020+
"@boost.phoenix",
1021+
"@boost.polygon",
1022+
"@boost.serialization",
1023+
"@boost.spirit",
10231024
"@com_github_gabime_spdlog//:spdlog",
10241025
"@tk_tcl//:tcl",
10251026
"@net_zlib//:zlib",

0 commit comments

Comments
 (0)