From cbe4ebb42afcecbd2ee655a4d9221fcc204f6980 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Sun, 13 Oct 2024 11:25:04 -0700 Subject: [PATCH 1/4] bazel: upgrade boost Signed-off-by: Noah Watkins --- MODULE.bazel | 6 +++--- MODULE.bazel.lock | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 0e53245f1406e..b12c8a529de66 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,9 +13,9 @@ git_override( bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost") archive_override( module_name = "rules_boost", - integrity = "sha256-Sk6Rjh7r4pUyRYQ4QO2qhgZYvdkWbyrLJTCl9oY6Z7I=", - strip_prefix = "rules_boost-21cd44506bd15e06db89aa2866b9be90002d8eec", - urls = "https://github.com/nelhage/rules_boost/archive/21cd44506bd15e06db89aa2866b9be90002d8eec.tar.gz", + integrity = "sha256-11a92WLh9/4kJKqJMVFMXNseylj1Yo9Tm2p7j+aqZO4=", + strip_prefix = "rules_boost-f30f047db172fec6049fb8453845d76ff8916512", + urls = "https://github.com/nelhage/rules_boost/archive/f30f047db172fec6049fb8453845d76ff8916512.tar.gz", ) non_module_boost_repositories = use_extension("@com_github_nelhage_rules_boost//:boost/repositories.bzl", "non_module_dependencies") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index d445a4e21b552..99b03ba949c7a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -156,13 +156,12 @@ "https://bcr.bazel.build/modules/toolchains_llvm/1.1.2/MODULE.bazel": "402101d6f73115ec49a3a765a3361c1dd90ba3959fa688ccdcd465c36dbbbc52", "https://bcr.bazel.build/modules/toolchains_llvm/1.1.2/source.json": "27f3cf531bc654c719b50411cac94613b7676d63e60962243d485af63e13b9ff", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", - "https://bcr.bazel.build/modules/xz/5.4.5.bcr.3/MODULE.bazel": "1f4f514bd40df12c54548bb7df07643d65e859b272e3b76e90181dfc1a55cb1e", - "https://bcr.bazel.build/modules/xz/5.4.5.bcr.3/source.json": "58cfd8a917944f183a3a808edb2e87de9e60b6269b643d7e3d1597267eaad6a2", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/MODULE.bazel": "2cbf58a2875e7f23ab77073902e009bfce25481fac231f950b89d57d441d5ef3", + "https://bcr.bazel.build/modules/xz/5.4.5.bcr.4/source.json": "f497d68412aab85c8aa83b54c0eac229fdce67c95c98a7ad562d58504ecaf9e5", "https://bcr.bazel.build/modules/yaml-cpp/0.8.0/MODULE.bazel": "879443fbbf128457a187bea6f278d05789f3fc465bb22c2e0fe7fdb52e45eef0", "https://bcr.bazel.build/modules/yaml-cpp/0.8.0/source.json": "8571372713f5030dbe517fb0cec549cef82aa5b76b4a178f902b95673ab5841c", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.1/MODULE.bazel": "6a9fe6e3fc865715a7be9823ce694ceb01e364c35f7a846bf0d2b34762bc066b", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d", "https://bcr.bazel.build/modules/zstd/1.5.6/MODULE.bazel": "471ebe7d3cdd8c6469390fcf623eb4779ff55fbee0a87f1dc57a1def468b96d4", From 8666e0980527b9ef43d13f903eb956eec7b0921d Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Sun, 13 Oct 2024 11:31:04 -0700 Subject: [PATCH 2/4] bazel: add patch for boost deps fix Signed-off-by: Noah Watkins --- MODULE.bazel | 4 ++++ .../boost_iterator_fusion_pr_583.patch | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 bazel/thirdparty/boost_iterator_fusion_pr_583.patch diff --git a/MODULE.bazel b/MODULE.bazel index b12c8a529de66..6699a7822c779 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -14,6 +14,10 @@ bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost") archive_override( module_name = "rules_boost", integrity = "sha256-11a92WLh9/4kJKqJMVFMXNseylj1Yo9Tm2p7j+aqZO4=", + patch_strip = 1, + patches = [ + "//bazel/thirdparty:boost_iterator_fusion_pr_583.patch", + ], strip_prefix = "rules_boost-f30f047db172fec6049fb8453845d76ff8916512", urls = "https://github.com/nelhage/rules_boost/archive/f30f047db172fec6049fb8453845d76ff8916512.tar.gz", ) diff --git a/bazel/thirdparty/boost_iterator_fusion_pr_583.patch b/bazel/thirdparty/boost_iterator_fusion_pr_583.patch new file mode 100644 index 0000000000000..ae14aecffe714 --- /dev/null +++ b/bazel/thirdparty/boost_iterator_fusion_pr_583.patch @@ -0,0 +1,21 @@ +commit b3fb95d1fd00490a78b723a825e76ecafbf3b27a +Author: Noah Watkins +Date: Sun Oct 13 11:20:16 2024 -0700 + + Add fusion dependency to iterator + + external/rules_boost~~non_module_dependencies~boost/libs/iterator/include/boost/iterator/zip_iterator.hpp:20:10: error: 'boost/fusion/adapted/boost_tuple.hpp' file not found [clang-diagnostic-error] + 20 | #include // for backward compatibility + +diff --git a/boost.BUILD b/boost.BUILD +index 588030c..dbaf6ff 100644 +--- a/boost.BUILD ++++ b/boost.BUILD +@@ -1096,6 +1096,7 @@ boost_library( + name = "iterator", + deps = [ + ":detail", ++ ":fusion", + ":static_assert", + ":type_traits", + ":utility", From 8f0bb1cda601ae89cb36e76d857d95addc223a13 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Sun, 13 Oct 2024 11:31:25 -0700 Subject: [PATCH 3/4] bazel: add missing dependencies Signed-off-by: Noah Watkins --- src/v/container/BUILD | 3 +++ src/v/thirdparty/protobuf/BUILD | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/v/container/BUILD b/src/v/container/BUILD index 3a1936f6b81ea..bdc5025486536 100644 --- a/src/v/container/BUILD +++ b/src/v/container/BUILD @@ -69,6 +69,9 @@ redpanda_cc_library( ], include_prefix = "container", visibility = ["//visibility:public"], + deps = [ + "@boost//:iterator", + ], ) redpanda_cc_library( diff --git a/src/v/thirdparty/protobuf/BUILD b/src/v/thirdparty/protobuf/BUILD index 9ce0f314124c9..8e5f127b1745f 100644 --- a/src/v/thirdparty/protobuf/BUILD +++ b/src/v/thirdparty/protobuf/BUILD @@ -13,4 +13,7 @@ cc_library( ], include_prefix = "thirdparty/protobuf", visibility = ["//visibility:public"], + deps = [ + "@protobuf", + ], ) From f55edd1de9516c20191435bfb90f66afd0e8c442 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Sun, 13 Oct 2024 12:10:46 -0700 Subject: [PATCH 4/4] bazel: upgrade boost to incorporate patch Signed-off-by: Noah Watkins --- MODULE.bazel | 10 +++------ .../boost_iterator_fusion_pr_583.patch | 21 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 bazel/thirdparty/boost_iterator_fusion_pr_583.patch diff --git a/MODULE.bazel b/MODULE.bazel index 6699a7822c779..2182c2708b5e6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,13 +13,9 @@ git_override( bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost") archive_override( module_name = "rules_boost", - integrity = "sha256-11a92WLh9/4kJKqJMVFMXNseylj1Yo9Tm2p7j+aqZO4=", - patch_strip = 1, - patches = [ - "//bazel/thirdparty:boost_iterator_fusion_pr_583.patch", - ], - strip_prefix = "rules_boost-f30f047db172fec6049fb8453845d76ff8916512", - urls = "https://github.com/nelhage/rules_boost/archive/f30f047db172fec6049fb8453845d76ff8916512.tar.gz", + integrity = "sha256-ICuTlyfxD3u1tr12YyeT5qPcA/ZkEUvtMDA2ZRzz1zc=", + strip_prefix = "rules_boost-e23cc59f87d5049618472d6ce0ca0ed5ef0c23dc", + urls = "https://github.com/nelhage/rules_boost/archive/e23cc59f87d5049618472d6ce0ca0ed5ef0c23dc.tar.gz", ) non_module_boost_repositories = use_extension("@com_github_nelhage_rules_boost//:boost/repositories.bzl", "non_module_dependencies") diff --git a/bazel/thirdparty/boost_iterator_fusion_pr_583.patch b/bazel/thirdparty/boost_iterator_fusion_pr_583.patch deleted file mode 100644 index ae14aecffe714..0000000000000 --- a/bazel/thirdparty/boost_iterator_fusion_pr_583.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b3fb95d1fd00490a78b723a825e76ecafbf3b27a -Author: Noah Watkins -Date: Sun Oct 13 11:20:16 2024 -0700 - - Add fusion dependency to iterator - - external/rules_boost~~non_module_dependencies~boost/libs/iterator/include/boost/iterator/zip_iterator.hpp:20:10: error: 'boost/fusion/adapted/boost_tuple.hpp' file not found [clang-diagnostic-error] - 20 | #include // for backward compatibility - -diff --git a/boost.BUILD b/boost.BUILD -index 588030c..dbaf6ff 100644 ---- a/boost.BUILD -+++ b/boost.BUILD -@@ -1096,6 +1096,7 @@ boost_library( - name = "iterator", - deps = [ - ":detail", -+ ":fusion", - ":static_assert", - ":type_traits", - ":utility",