Skip to content

Commit

Permalink
switch to even newer curl that supports mbedtls, and http_only flags.…
Browse files Browse the repository at this point in the history
… Need more patching for prometheus-cpp to start using it
  • Loading branch information
malkia committed Apr 17, 2024
1 parent d9fa869 commit 9bd113f
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 7,602 deletions.
5 changes: 5 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,8 @@ build --bes_backend=grpcs://remote.buildbuddy.io
build --remote_header=x-buildbuddy-api-key=IBmejTnDhjBp4H9xO5Vr
build --nolegacy_important_outputs


build --@curl//:use_mbedtls=true
# build --@curl//:http_only=true

mod --lockfile_mode=off
17 changes: 11 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ module(
repo_name = "io_opentelemetry_cpp",
)

bazel_dep(name = "curl", version = "8.4.0")
single_version_override(
module_name = "curl",
patch_strip = 1,
patches = ["bazel/curl_missing_windows_ldap.patch"],
)
bazel_dep(name = "curl", version = "8.4.0.bcr.1")

bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
bazel_dep(name = "aspect_bazel_lib", version = "2.7.0")
Expand All @@ -33,6 +28,16 @@ single_version_override(

bazel_dep(name = "opentelemetry-proto", version = "1.1.0")
bazel_dep(name = "prometheus-cpp", version = "1.2.4")
#single_version_override(
#module_name = "prometheus-cpp",
#version = "1.2.4",
#patch_strip = 1,
#patches = [
#"bazel/prometheus_cpp_curl_bzlmod.patch",
#"bazel/prometheus_cpp_rm_bzlmod_lock.patch",
#],
#)

bazel_dep(name = "boringssl", version = "0.0.0-20240126-22d349c")
bazel_dep(name = "zlib", version = "1.3.1.bcr.1")
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
Expand Down
Loading

0 comments on commit 9bd113f

Please sign in to comment.