Skip to content

Commit 17a5144

Browse files
oharboeclaude
andcommitted
bazel: bump bazel-orfs to 60d62021, orfs to 4b3f2663, yosys 0.64
Run `bazelisk run @bazel-orfs//:bump`, moving the bazel-orfs / bazel-orfs-verilog pin from 78f19f25 to 60d62021c779. The bump pulls yosys 0.64 transitively; make the explicit bazel_dep match (was 0.62.bcr.2). The regenerated lock also records the extension's new openroad_qt wiring (@@//:openroad-qt) exposed by the newer bazel-orfs. Also bump the orfs (OpenROAD-flow-scripts) archive_override from 10a2baea to 4b3f2663. The old pin predated flow/BUILD's exports_files(["scripts/synth.tcl"]) (79074a557), so bazel-orfs 60d62021's `_synth_tcl` default of @orfs//flow:scripts/synth.tcl failed with a visibility error. The newer orfs restructured MODULE.bazel to mark its non-root-only directives dev_dependency, so the old remove-non-root-overrides patch is obsolete. Replace it with a one-line patch: @orfs//flow loads @bazel-orfs//:openroad.bzl, but orfs also marks its bazel-orfs bazel_dep dev_dependency, which drops @bazel-orfs from orfs's repo mapping when orfs is a non-root dep, so loading @orfs//flow fails with "No repository visible as '@bazel-orfs' from repository '@@orfs+'". The patch makes that bazel_dep non-dev; the version is unified by the root module's pin. Verified: //test/orfs/mock-array:multiplier_8x8_synth (which failed Jenkins with the synth.tcl visibility error) now analyzes clean, and the module graph resolves against the new orfs pin. No patches were droppable this round: the gnulib libc-header shadowing workarounds (bison, tcl_lang patches; sed/gawk/m4 pins) and the abc / boost.icl / boost.context / scip patches all still lack a published BCR release carrying the upstream fix. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
1 parent e823004 commit 17a5144

4 files changed

Lines changed: 42 additions & 60 deletions

File tree

MODULE.bazel

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ bazel_dep(name = "rules_nodejs", version = "6.7.3", dev_dependency = True)
192192
bazel_dep(name = "bazel-orfs", dev_dependency = True)
193193
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
194194

195-
BAZEL_ORFS_COMMIT = "78f19f25cec73bdec3517a76465dec7ce17ce227"
195+
BAZEL_ORFS_COMMIT = "60d62021c779e64ef7360a1b08a8faee00183c8d"
196196

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

@@ -210,27 +210,30 @@ git_override(
210210
strip_prefix = "verilog",
211211
)
212212

213-
# bazel-orfs pulls in orfs without a version and patches yosys, relying on
214-
# overrides that only apply when bazel-orfs is the root module. Mirror them
215-
# here so OpenROAD-as-root can resolve the module graph.
213+
# @orfs marks most non-root-only directives (qt-bazel/yosys-slang git_overrides,
214+
# orfs.default(), toolchain registration) as dev_dependency, so they are no-ops
215+
# here. But @orfs//flow loads @bazel-orfs//:openroad.bzl, and @orfs marks its
216+
# bazel-orfs bazel_dep dev_dependency too, which drops @bazel-orfs from @orfs's
217+
# repo mapping when consumed non-root — so loading @orfs//flow fails. The patch
218+
# makes that one bazel_dep non-dev.
216219
#
217220
# Use archive_override (HTTPS tarball) rather than git_override so the
218221
# build resolves on networks that block direct git access to github.com.
219-
ORFS_COMMIT = "10a2baea2171059ec14cda9a5855aa26dd7572c6"
222+
ORFS_COMMIT = "4b3f2663609fd3f6fd8d862729de1ec5967eb4e6"
220223

221224
bazel_dep(name = "orfs", dev_dependency = True)
222225
archive_override(
223226
module_name = "orfs",
224227
patch_strip = 1,
225228
patches = [
226-
"//bazel/bazel-orfs-patches:0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch",
229+
"//bazel/bazel-orfs-patches:0035-orfs-bazel-orfs-visible-non-root.patch",
227230
],
228-
sha256 = "8325c6755215857a87a84db078d47dfbb2dfcbef70eaf0dd376fe5a7a363cd58",
231+
sha256 = "b6e496221b5be5a5ecd54e978a7a8157a212b67374e2ecd6c27f90d35e02b473",
229232
strip_prefix = "OpenROAD-flow-scripts-" + ORFS_COMMIT,
230233
urls = ["https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts/archive/" + ORFS_COMMIT + ".tar.gz"],
231234
)
232235

233-
bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
236+
bazel_dep(name = "yosys", version = "0.64", dev_dependency = True)
234237
bazel_dep(name = "yosys-slang", version = "0.0.0", dev_dependency = True)
235238
archive_override(
236239
module_name = "yosys-slang",

MODULE.bazel.lock

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

bazel/bazel-orfs-patches/0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Oyvind Harboe <oyvind.harboe@zylin.com>
3+
Date: Wed, 8 Jul 2026 00:00:00 +0000
4+
Subject: [PATCH] orfs: keep bazel-orfs visible when orfs is a non-root dep
5+
6+
@orfs//flow loads @bazel-orfs//:openroad.bzl, so @bazel-orfs must be in
7+
@orfs's repo mapping. Upstream marks the bazel-orfs bazel_dep as
8+
dev_dependency, which drops it from the mapping when @orfs is consumed
9+
as a non-root dependency, so loading @orfs//flow fails with "No
10+
repository visible as '@bazel-orfs' from repository '@@orfs+'". Make the
11+
bazel_dep non-dev; the bazel-orfs version is unified by the root
12+
module's pin either way.
13+
14+
Signed-off-by: Oyvind Harboe <oyvind.harboe@zylin.com>
15+
---
16+
--- a/MODULE.bazel
17+
+++ b/MODULE.bazel
18+
@@ -33,7 +33,7 @@
19+
remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
20+
)
21+
22+
-bazel_dep(name = "bazel-orfs", dev_dependency = True)
23+
+bazel_dep(name = "bazel-orfs")
24+
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
25+
26+
BAZEL_ORFS_COMMIT = "6ebadeb4be5c9ada103081c9a5e668c014126616"

0 commit comments

Comments
 (0)