Skip to content

Commit 3157737

Browse files
authored
Use fmt BCR 12.2.0 with Windows workaround
1 parent d048fc9 commit 3157737

8 files changed

Lines changed: 27 additions & 91 deletions

File tree

‎MODULE.bazel‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ bazel_dep(name = "rules_shell", version = "0.8.0")
2525
bazel_dep(name = "bazel_skylib", version = "1.9.0")
2626
bazel_dep(name = "abseil-cpp", version = "20260107.1", repo_name = "absl")
2727
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.2", repo_name = "json")
28-
bazel_dep(name = "fmt", version = "12.2.0-codeql.1")
28+
bazel_dep(name = "fmt", version = "12.2.0.bcr.1")
29+
single_version_override(
30+
module_name = "fmt",
31+
patch_strip = 1,
32+
patches = ["//misc/bazel/registry/patches:fmt_windows_unicode.patch"],
33+
version = "12.2.0.bcr.1",
34+
)
35+
2936
bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
3037
bazel_dep(name = "gazelle", version = "0.54.0")
3138
bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1")

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/MODULE.bazel‎

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

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/overlay/BUILD.bazel‎

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

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/overlay/MODULE.bazel‎

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

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/source.json‎

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

‎misc/bazel/registry/modules/fmt/metadata.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"github:fmtlib/fmt"
1717
],
1818
"versions": [
19-
"12.1.0-codeql.1",
20-
"12.2.0-codeql.1"
19+
"12.1.0-codeql.1"
2120
],
2221
"yanked_versions": {}
2322
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
exports_files([
2+
"fmt_windows_unicode.patch",
3+
])
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- a/BUILD.bazel
2+
+++ b/BUILD.bazel
3+
@@ -48,7 +48,12 @@
4+
hdrs = glob([
5+
"include/fmt/*.h",
6+
]),
7+
+ # CodeQL change: disable UTF8 support, it's causing issues on Windows
8+
+ defines = select({
9+
+ "@rules_cc//cc/compiler:msvc-cl": ["FMT_UNICODE=0"],
10+
+ "//conditions:default": [],
11+
+ }),
12+
copts = select({
13+
"@rules_cc//cc/compiler:msvc-cl": ["/utf-8"],
14+
"//conditions:default": [],
15+
}),

0 commit comments

Comments
 (0)