Change asio BUILD to be compatible with the BCR version

mvukov · Jun 30, 2024 · 54cd64a · 54cd64a
1 parent b3247c9
commit 54cd64a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/repositories/asio.BUILD.bazel b/repositories/asio.BUILD.bazel
@@ -5,15 +5,10 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 
 cc_library(
  name = "asio",
- srcs = glob(["src/*.cpp"]),
- hdrs = glob([
- "include/**/*.hpp",
- "include/**/*.ipp",
+ srcs = glob([
+ "**/*.hpp",
+ "**/*.ipp",
  ]),
- defines = [
- "ASIO_SEPARATE_COMPILATION",
- ],
- includes = ["include"],
+ includes = ["."],
  visibility = ["//visibility:public"],
- deps = ["@boringssl//:ssl"],
 )
diff --git a/repositories/foxglove_bridge.BUILD.bazel b/repositories/foxglove_bridge.BUILD.bazel
@@ -25,6 +25,7 @@ cc_library(
  copts = ["-std=c++17"],
  includes = ["foxglove_bridge_base/include"],
  deps = [
+ "@boringssl//:ssl",
  "@nlohmann_json//:json",
  "@websocketpp",
  ],

diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl
@@ -129,9 +129,9 @@ def ros2_workspace_repositories():
  http_archive,
  name = "asio",
  build_file = "@com_github_mvukov_rules_ros2//repositories:asio.BUILD.bazel",
- sha256 = "b31c63867daaba0e460ee2c85dc508a52c81db0a7318e0d2147f444b26f80ed7",
- strip_prefix = "asio-asio-1-27-0/asio",
- urls = ["https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-27-0.tar.gz"],
+ sha256 = "5705a0e403017eba276625107160498518838064a6dd7fd8b00b2e30c0ffbdee",
+ strip_prefix = "asio-asio-1-28-2/asio/include",
+ urls = ["https://github.com/chriskohlhoff/asio/archive/refs/tags/asio-1-28-2.tar.gz"],
  )
 
  # We're pointing at hedronvision's mirror of google/boringssl:main-with-bazel to get