Skip to content

Commit f2b0391

Browse files
committed
deps: bump bazel-orfs to PR #720 head, drop upstreamed patches
bazel-orfs PR The-OpenROAD-Project/bazel-orfs#720 lands the two patches we were carrying as 0001/0002: - orfs_design() accepts config = "config.mk" explicitly and drops the blanket native.exports_files(native.glob(["*"])); - orfs_design() takes a local_arguments= list to drop config.mk helpers (e.g. VERILOG_FILES_BLACKBOX) before orfs_flow(). It also adds parser unit tests covering the VERILOG_FILES_BLACKBOX pattern that local_arguments= targets. Bump bazel-orfs to 717655415d (PR #720 head) and drop both patches. bazel/BUILD shrinks to a single exports_files(["install.sh"]) — the only remaining reason for the package is making //bazel:install.sh resolvable from //:install_for_bazel. Verified: bazelisk test //flow/designs/asap7/gcd/... passes; microwatt and chameleon (both consumers of local_arguments=) parse. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
1 parent e731422 commit f2b0391

5 files changed

Lines changed: 3 additions & 159 deletions

MODULE.bazel

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,14 @@ git_override(
3737
bazel_dep(name = "bazel-orfs", dev_dependency = True)
3838
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
3939

40-
BAZEL_ORFS_COMMIT = "b1ceeb28fc41b80b1fa85032e0770203847d4ba7"
40+
BAZEL_ORFS_COMMIT = "717655415dd4446ca4e2fc09907465c75cb23912"
4141

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

4444
# To bump version, run: bazelisk run @bazel-orfs//:bump
4545
git_override(
4646
module_name = "bazel-orfs",
4747
commit = BAZEL_ORFS_COMMIT,
48-
patches = [
49-
"//bazel:0001-orfs_design-accept-config-mk-explicitly-drop-exports.patch",
50-
"//bazel:0002-orfs_design-add-local_arguments-to-drop-helper-vars.patch",
51-
],
52-
patch_strip = 1,
5348
remote = BAZEL_ORFS_REMOTE,
5449
)
5550

MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/0001-orfs_design-accept-config-mk-explicitly-drop-exports.patch

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

bazel/0002-orfs_design-add-local_arguments-to-drop-helper-vars.patch

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

bazel/BUILD

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
exports_files(
2-
glob(["*.patch"]) + ["install.sh"],
3-
)
1+
exports_files(["install.sh"])

0 commit comments

Comments
 (0)