Update aws C-99 libraries

laramiel · copybara-github · commit d4dac2899e71 · 2025-02-06T23:47:42.000-08:00
PiperOrigin-RevId: 724227387
Change-Id: I82fabba6f71af92264c68ccb1839ca7a046da28f
diff --git a/third_party/aws_c_auth/workspace.bzl b/third_party/aws_c_auth/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_auth",
-        sha256 = "7f97aacef6bd1649734383c2bf022250671f353b7fa60d195e6865d7f4594b43",
-        strip_prefix = "aws-c-auth-0.7.31",
+        sha256 = "5a49b43aba7d2be6217b73dc40256120d31a7d0ca2c3f96d06e5154beed5de7a",
+        strip_prefix = "aws-c-auth-0.8.4",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-auth/archive/v0.7.31.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-auth/archive/v0.8.4.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_auth/aws_c_auth.BUILD.bazel"),
         cmake_name = "aws_c_auth",
diff --git a/third_party/aws_c_cal/workspace.bzl b/third_party/aws_c_cal/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_cal",
-        sha256 = "8020ecbe850ceb402aa9c81a1ef34e3becdbcb49587a1b19eb5c7e040f369b58",
-        strip_prefix = "aws-c-cal-0.7.4",
+        sha256 = "413a5226a881eb2d7c7b453707c90b6ad1c0f63edfc15e87087f56d7d10c2a1b",
+        strip_prefix = "aws-c-cal-0.8.3",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-cal/archive/v0.7.4.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-cal/archive/v0.8.3.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_cal/aws_c_cal.BUILD.bazel"),
         cmake_name = "aws_c_cal",
diff --git a/third_party/aws_c_common/workspace.bzl b/third_party/aws_c_common/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_common",
-        sha256 = "bf265e9e409d563b0eddcb66e1cb00ff6b371170db3e119348478d911d054317",
-        strip_prefix = "aws-c-common-0.9.28",
+        sha256 = "88115d6f3e4f79d8b2544ed8a95d8a9699985aed38aeb4779d7c9fffde1fee58",
+        strip_prefix = "aws-c-common-0.11.0",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-common/archive/v0.9.28.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-common/archive/v0.11.0.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_common/aws_c_common.BUILD.bazel"),
         cmake_name = "aws_c_common",
diff --git a/third_party/aws_c_compression/workspace.bzl b/third_party/aws_c_compression/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_compression",
-        sha256 = "51796f98a29a0d6e257c02e1f842bbc41db324758939093e6d46ec28337a3272",
-        strip_prefix = "aws-c-compression-0.2.19",
+        sha256 = "d89fca17a37de762dc34f332d2da402343078da8dbd2224c46a11a88adddf754",
+        strip_prefix = "aws-c-compression-0.3.1",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-compression/archive/v0.2.19.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-compression/archive/v0.3.1.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_compression/aws_c_compression.BUILD.bazel"),
         cmake_name = "aws_c_compression",
diff --git a/third_party/aws_c_event_stream/workspace.bzl b/third_party/aws_c_event_stream/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_event_stream",
-        sha256 = "d7d82c38bae68d2287ac59972a76b2b6159e7a3d7c9b7edb1357495aa4d0c0de",
-        strip_prefix = "aws-c-event-stream-0.4.3",
+        sha256 = "22ce7a695b82debe118c9ecc641ea8bc7e59c9843f92d5acf8401fc86cac847a",
+        strip_prefix = "aws-c-event-stream-0.5.1",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-event-stream/archive/v0.4.3.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-event-stream/archive/v0.5.1.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_event_stream/aws_c_event_stream.BUILD.bazel"),
         cmake_name = "aws_c_event_stream",
diff --git a/third_party/aws_c_http/workspace.bzl b/third_party/aws_c_http/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_http",
-        sha256 = "f878802a4e0bcefadce9959ce443acaf77607a68d138f9d3db04a5a878f1a871",
-        strip_prefix = "aws-c-http-0.8.10",
+        sha256 = "63061321fd3234a4f8688cff1a6681089321519436a5f181e1bcb359204df7c8",
+        strip_prefix = "aws-c-http-0.9.3",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-http/archive/v0.8.10.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-http/archive/v0.9.3.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_http/aws_c_http.BUILD.bazel"),
         cmake_name = "aws_c_http",
diff --git a/third_party/aws_c_io/aws_c_io.BUILD.bazel b/third_party/aws_c_io/aws_c_io.BUILD.bazel
@@ -69,15 +69,15 @@ cc_library(
         ],
         "//conditions:default": [],
     }),
-    local_defines = select({
+    local_defines = ["AWS_S2N_INSOURCE_PATH"] + select({
         "@platforms//os:windows": [
-            "AWS_USE_IO_COMPLETION_PORTS",
+            "AWS_ENABLE_IO_COMPLETION_PORTS",
         ],
         "@platforms//os:osx": [
-            "AWS_USE_KQUEUE",
+            "AWS_ENABLE_KQUEUE",
         ],
         "//conditions:default": [
-            "AWS_USE_EPOLL",
+            "AWS_ENABLE_EPOLL",
             "USE_S2N",
         ],
     }),
diff --git a/third_party/aws_c_io/workspace.bzl b/third_party/aws_c_io/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_io",
-        sha256 = "44e9dee181ed7d867d1cc2944f4b4669259b569fc56bdd6dd4c7c30440fc4bf8",
-        strip_prefix = "aws-c-io-0.14.18",
+        sha256 = "e5202033b09df61ffb2a57284a04735ac013296decc107de1c4abd1ce7d5cfda",
+        strip_prefix = "aws-c-io-0.15.4",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-io/archive/v0.14.18.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-io/archive/v0.15.4.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_io/aws_c_io.BUILD.bazel"),
         cmake_name = "aws_c_io",
diff --git a/third_party/aws_c_mqtt/workspace.bzl b/third_party/aws_c_mqtt/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_mqtt",
-        sha256 = "7579fafc74a8751c15c0196eda6ec93d00a17e7f79fb994f34a8f62ceb66cc62",
-        strip_prefix = "aws-c-mqtt-0.10.6",
+        sha256 = "04abe47c798bf9dcb95e25ea9acd62a35a3f22e58b61c16912a6275c2f8230fe",
+        strip_prefix = "aws-c-mqtt-0.12.1",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-mqtt/archive/v0.10.6.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-mqtt/archive/v0.12.1.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_mqtt/aws_c_mqtt.BUILD.bazel"),
         cmake_name = "aws_c_mqtt",
diff --git a/third_party/aws_c_s3/workspace.bzl b/third_party/aws_c_s3/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_s3",
-        sha256 = "2945ffb9e6529f560b34eee018ebdd4397288477f2df0126b5fd5cc2490fd056",
-        strip_prefix = "aws-c-s3-0.6.6",
+        sha256 = "6602c92c8b4602dee50636f4128a7842f7359314d030db35368120491b3582bc",
+        strip_prefix = "aws-c-s3-0.7.11",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-s3/archive/v0.6.6.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-s3/archive/v0.7.11.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_s3/aws_c_s3.BUILD.bazel"),
         cmake_name = "aws_c_s3",
diff --git a/third_party/aws_c_sdkutils/workspace.bzl b/third_party/aws_c_sdkutils/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_c_sdkutils",
-        sha256 = "66bd7a8679703386aec1539407aaed0942a78032fe340ab44e810a3cf6d7e505",
-        strip_prefix = "aws-c-sdkutils-0.1.19",
+        sha256 = "5a0489d508341b84eea556e351717bc33524d3dfd6207ee3aba6068994ea6018",
+        strip_prefix = "aws-c-sdkutils-0.2.3",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-sdkutils/archive/v0.1.19.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-c-sdkutils/archive/v0.2.3.tar.gz",
         ],
         build_file = Label("//third_party:aws_c_sdkutils/aws_c_sdkutils.BUILD.bazel"),
         cmake_name = "aws_c_sdkutils",
diff --git a/third_party/aws_checksums/workspace.bzl b/third_party/aws_checksums/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_checksums",
-        sha256 = "12f80085993662b6d2cbd2d090b49b4350d19396b1d218d52323712cc8dee252",
-        strip_prefix = "aws-checksums-0.1.20",
+        sha256 = "c688f311db8a1b70bb6d22f6e8f2817b39e1419546e339cf753d61340969eeb4",
+        strip_prefix = "aws-checksums-0.2.3",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-checksums/archive/v0.1.20.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/awslabs/aws-checksums/archive/v0.2.3.tar.gz",
         ],
         build_file = Label("//third_party:aws_checksums/aws_checksums.BUILD.bazel"),
         cmake_name = "aws_checksums",
diff --git a/third_party/aws_s2n_tls/aws_s2n_tls.BUILD.bazel b/third_party/aws_s2n_tls/aws_s2n_tls.BUILD.bazel
@@ -7,6 +7,13 @@ licenses(["notice"])  # Apache 2.0
 
 cc_library(
     name = "s2n_tls",
+    hdrs = glob(["api/**/*.h"]),
+    includes = ["api"],
+    deps = [":s2n_tls_impl"],
+)
+
+cc_library(
+    name = "s2n_tls_impl",
     srcs = glob([
         "crypto/*.h",
         "crypto/*.c",
@@ -20,6 +27,25 @@ cc_library(
         "utils/*.c",
     ]),
     hdrs = glob(["api/**/*.h"]),
-    includes = ["api"],
+    includes = ["api", "."],
+    copts = select({
+        ":compiler_msvc": ["/FI$(location :utils/s2n_prelude.h)"],
+        "//conditions:default": [
+            "-include$(location :utils/s2n_prelude.h)",
+        ],
+    }),
+    visibility = ["//visibility:private"],
     deps = ["@com_google_boringssl//:crypto"],
 )
+
+exports_files(["utils/s2n_prelude.h"])
+
+[
+    alias(
+        name = name,
+        actual = "@tensorstore//:{target}".format(target = name),
+    )
+    for name in [
+        "compiler_msvc",
+    ]
+]
diff --git a/third_party/aws_s2n_tls/workspace.bzl b/third_party/aws_s2n_tls/workspace.bzl
@@ -21,10 +21,10 @@ def repo():
     maybe(
         third_party_http_archive,
         name = "aws_s2n_tls",
-        sha256 = "609d4ab5747e592a8749f2db7ff6422ea2e0aff3d2790b6d36defe276f422a71",
-        strip_prefix = "s2n-tls-1.5.3",
+        sha256 = "5690f030da35f86e3b5d61d1de150b5b52c84eef383799f7a706bdf21227417e",
+        strip_prefix = "s2n-tls-1.5.11",
         urls = [
-            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/aws/s2n-tls/archive/v1.5.3.tar.gz",
+            "https://storage.googleapis.com/tensorstore-bazel-mirror/github.com/aws/s2n-tls/archive/v1.5.11.tar.gz",
         ],
         build_file = Label("//third_party:aws_s2n_tls/aws_s2n_tls.BUILD.bazel"),
         cmake_name = "s2n_tls",
diff --git a/tools/cmake/bazel_to_cmake/emit_cc.py b/tools/cmake/bazel_to_cmake/emit_cc.py
@@ -31,14 +31,14 @@
 from .starlark.bazel_target import TargetId
 from .starlark.invocation_context import InvocationContext
 from .starlark.provider import ProviderTuple
-from .starlark.select import Configurable
 from .util import is_relative_to
 from .util import make_relative_path
 from .util import partition_by
 from .util import PathCollection
 from .util import quote_list
 from .util import quote_path_list
 from .util import quote_unescaped_list
+from .variable_substitution import apply_location_substitutions
 from .workspace import Workspace
 
 _SEP = "\n        "
@@ -183,7 +183,7 @@ def construct_cc_includes(
     *,
     source_directory: pathlib.PurePath,
     cmake_binary_dir: pathlib.PurePath,
-    includes: Optional[Configurable[List[str]]] = None,
+    includes: Optional[Collection[str]] = None,
     include_prefix: Optional[str] = None,
     strip_include_prefix: Optional[str] = None,
     known_include_files: Optional[PathCollection] = None,
@@ -332,7 +332,7 @@ def handle_cc_common_options(
     srcs: Optional[Collection[TargetId]] = None,
     deps: Optional[Collection[TargetId]] = None,
     implementation_deps: Optional[Collection[TargetId]] = None,
-    includes: Optional[Collection[TargetId]] = None,
+    includes: Optional[Collection[str]] = None,
     include_prefix: Optional[str] = None,
     strip_include_prefix: Optional[str] = None,
     hdrs_file_paths: Optional[Collection[str]] = None,
@@ -388,6 +388,23 @@ def add_compile_options(lang: str, options: List[str]):
   add_compile_options("C,CXX", state.workspace.copts)
   add_compile_options("CXX", state.workspace.cxxopts)
 
+  # https://bazel.build/reference/be/make-variables
+  # https://bazel.build/reference/be/c-cpp
+  # Make variable substitutions apply to the following options:
+  # copts, conlyopts, cxxopts, defines
+  # includes, linkopts, local_defines
+  # For most variables, CMAKE will expand them in the command line, however for
+  # $(location) and a few other constructs they need to be handled here.
+  def apply_substitutions(k: str, value: Any):
+    if not value:
+      return value
+    new_value = [
+        apply_location_substitutions(_context, v, relative_to="") for v in value
+    ]
+    if new_value != value:
+      print(f"Substituted {k}: {value} to {new_value}")
+    return new_value
+
   result: Dict[str, Any] = {
       "srcs": repo.replace_with_cmake_macro_dirs(sorted(set(srcs_file_paths))),
       "link_libraries": link_libraries,
@@ -403,8 +420,10 @@ def add_compile_options(lang: str, options: List[str]):
   for k in ["copts", "linkopts", "defines", "local_defines"]:
     value = kwargs.get(k)
     if value is None:
-      value = []
-    result[k] = _context.evaluate_configurable_list(cast(Any, value))
+      result[k] = []
+    else:
+      resolved = _context.evaluate_configurable_list(cast(Any, value))
+      result[k] = apply_substitutions(k, resolved)
 
   result["defines"].extend(state.workspace.cdefines)
 
@@ -421,6 +440,7 @@ def add_compile_options(lang: str, options: List[str]):
       + (textual_hdrs_file_paths or [])
   )
 
+  includes = apply_substitutions("includes", includes)
   result["includes"] = repo.replace_with_cmake_macro_dirs(
       construct_cc_includes(
           _context.caller_package_id,
diff --git a/tools/cmake/bazel_to_cmake/variable_substitution.py b/tools/cmake/bazel_to_cmake/variable_substitution.py
@@ -108,12 +108,6 @@ def _get_location_replacement(
 ) -> str:
   """Returns a $(location) replacement for the given key and label."""
 
-  def _get_relpath(path: str):
-    rel_path = os.path.relpath(path, relative_to)
-    if os.sep != "/":
-      rel_path = rel_path.replace(os.sep, "/")
-    return rel_path
-
   target = _context.resolve_target(label)
   state = _context.access(EvaluationState)
 
@@ -132,7 +126,13 @@ def _get_relpath(path: str):
 
   files_provider = info.get(FilesProvider)
   if files_provider is not None:
-    rel_paths = [_get_relpath(path) for path in files_provider.paths]
+    if relative_to is not None:
+      rel_paths = [
+          make_relative_path(path, (None, relative_to))[1].as_posix()
+          for path in files_provider.paths
+      ]
+    else:
+      rel_paths = [str(path) for path in files_provider.paths]
     if not key.endswith("s"):
       if len(rel_paths) != 1:
         raise ValueError(f"Expected single file but received: {rel_paths}")
