Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.1
8.5.1
1 change: 1 addition & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module(
)

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "platforms", version = "1.1.0")
bazel_dep(name = "rules_cc", version = "0.1.1")

bazel_dep(name = "obr", version = "1.0.0")
Expand Down
4 changes: 0 additions & 4 deletions src/renderer/obr/obr_capi/obr/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# Until we have migrated all deps out of WORKSPACE file, we need to continue to
# use it. Starting with bazel 8, this flag flips to default false.
common --enable_workspace

# Toolchain flags shared with the parent oar build live in toolchain.bazelrc.
import %workspace%/toolchain.bazelrc
2 changes: 1 addition & 1 deletion src/renderer/obr/obr_capi/obr/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.1
8.5.1
2 changes: 1 addition & 1 deletion src/renderer/obr/obr_capi/obr/docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bazel build -c opt //obr/cli:obr_cli

### Dependencies

Bazel dependencies are managed through both `MODULE.bazel` (bazelmod) and `WORKSPACE`. The project uses:
Bazel dependencies are managed through `MODULE.bazel` (Bzlmod). The project uses:

- [Abseil](https://abseil.io/) - C++ common libraries
- [Eigen](https://eigen.tuxfamily.org/) - Linear algebra
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/obr/obr_capi/obr/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ def _pffft_ext_impl(mctx):
name = "pffft",
remote = "https://bitbucket.org/jpommier/pffft.git",
commit = "0aec0327a6912e1a0ec5326eef737c2ce19bc836",
# Repository-qualified on purpose: a bare `//external:pffft.BUILD`
# Repository-qualified on purpose: a bare `//third_party:pffft.BUILD`
# resolves against the main repository rather than against the module
# this file belongs to, so it breaks as soon as obr is consumed as a
# dependency instead of built on its own.
build_file = Label("@obr//external:pffft.BUILD"),
build_file = Label("@obr//third_party:pffft.BUILD"),
)

pffft_ext = module_extension(implementation = _pffft_ext_impl)
Expand Down
Loading