Skip to content

Commit f60d597

Browse files
authored
Merge pull request #4254 from oharboe/bazel-orfs-bump-yosys-0.64
bazel-orfs: bump and get yosys/abc 0.64 via custom registry
2 parents bd2a6b6 + ed4c065 commit f60d597

4 files changed

Lines changed: 11 additions & 67 deletions

File tree

.bazelrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# yosys 0.64 is not yet in BCR; add the unmerged PR's fork as a fallback
2+
# registry until bazelbuild/bazel-central-registry#8862 lands. BCR is
3+
# listed first so all other modules resolve from the official source;
4+
# the fork is only consulted for modules/versions BCR doesn't carry yet.
5+
# The commit hash makes the fork reference immutable. Mirrors what
6+
# bazel-orfs/.bazelrc does upstream — ORFS root has its own .bazelrc so
7+
# the upstream lines don't propagate automatically.
8+
common --registry=https://bcr.bazel.build/
9+
common --registry=https://raw.githubusercontent.com/oharboe/bazel-central-registry/0586b398db6edd245da97cbec29e26c5e2a808d7/
10+
111
build --incompatible_strict_action_env
212
build --cxxopt "-std=c++20" --host_cxxopt "-std=c++20"
313

MODULE.bazel

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,14 @@ git_override(
3636
bazel_dep(name = "bazel-orfs", dev_dependency = True)
3737
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
3838

39-
BAZEL_ORFS_COMMIT = "3a5ddd7eb48c363717e65903ae4573d528327fd3"
39+
BAZEL_ORFS_COMMIT = "6ebadeb4be5c9ada103081c9a5e668c014126616"
4040

4141
BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
4242

4343
# To bump version, run: bazelisk run @bazel-orfs//:bump
44-
#
45-
# `patches =` keeps small bazel-orfs fixes vendored in this repo while
46-
# we iterate, instead of round-tripping every change through a
47-
# bazel-orfs PR + pin bump. When a patch lands upstream, drop the
48-
# entry here and bump BAZEL_ORFS_COMMIT.
4944
git_override(
5045
module_name = "bazel-orfs",
5146
commit = BAZEL_ORFS_COMMIT,
52-
patch_strip = 1,
53-
patches = [
54-
"//patches/bazel-orfs:0001-render_gds-monkey-patch-PDK_CONFIGS-not-gdsii_use_custom_config.patch",
55-
],
5647
remote = BAZEL_ORFS_REMOTE,
5748
)
5849

patches/bazel-orfs/0001-render_gds-monkey-patch-PDK_CONFIGS-not-gdsii_use_custom_config.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

patches/bazel-orfs/BUILD.bazel

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)