Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions bazel/foreign_cc/yaml_cpp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/BUILD.bazel b/BUILD.bazel
index b0b9016..fb4c930 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -11,4 +11,6 @@ cc_library(
includes = ["include"],
hdrs = glob(["include/**/*.h"]),
srcs = glob(["src/**/*.cpp", "src/**/*.h"]),
+ # Define yaml_cpp_EXPORTS, as CMake does.
+ copts = ["-DYAML_CPP_STATIC_DEFINE"],
)
2 changes: 2 additions & 0 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,8 @@ def _com_github_intel_ipp_crypto_crypto_mb():
def _com_github_jbeder_yaml_cpp():
external_http_archive(
name = "com_github_jbeder_yaml_cpp",
patch_args = ["-p1"],
patches = ["@envoy//bazel/foreign_cc:yaml_cpp.patch"],
)
native.bind(
name = "yaml_cpp",
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,14 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "yaml-cpp",
project_desc = "YAML parser and emitter in C++ matching the YAML 1.2 spec",
project_url = "https://github.com/jbeder/yaml-cpp",
version = "db6deedcd301754723065e0bbb1b75927c5b49c7",
sha256 = "387d7f25467312ca59068081f9a25bbab02bb6af32fd3e0aec1bd59163558171",
version = "7d066556112e6899783608ef917b9b326fb6497a",
sha256 = "bf6aff0593445cdc779fd0d30f8af809e04cc636a0e72cf26f3f4dfc6fa01c11",
strip_prefix = "yaml-cpp-{version}",
urls = ["https://github.com/jbeder/yaml-cpp/archive/{version}.tar.gz"],
# YAML is also used for runtime as well as controlplane. It shouldn't appear on the
# dataplane but we can't verify this automatically due to code structure today.
use_category = ["controlplane", "dataplane_core"],
release_date = "2021-07-23",
release_date = "2022-04-03",
cpe = "cpe:2.3:a:yaml-cpp_project:yaml-cpp:*",
),
com_github_msgpack_msgpack_c = dict(
Expand Down