Skip to content

aws: add tinyxml2 dependency #30732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
suniltheta wants to merge 4 commits into from
Closed

aws: add tinyxml2 dependency #30732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9ac2e3
aws: add tinyxml2 dependency
Nov 5, 2023
3edd071
skip_on_windows
Nov 5, 2023
613c173
don't skip on windows and use linkopts to link libc
Nov 5, 2023
5e8efea
include linker -lpthread to fix linking fgets func
Nov 5, 2023
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
20 changes: 20 additions & 0 deletions bazel/foreign_cc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,3 +603,23 @@ envoy_cc_library(
"//conditions:default": [],
}),
)

envoy_cmake(
name = "tinyxml2",
cache_entries = {
"BUILD_SHARED_LIBS": "off",
"BUILD_STATIC_LIBS": "on",
"BUILD_TESTS": "off",
"CMAKE_CXX_COMPILER_FORCED": "on",
"CMAKE_INSTALL_LIBDIR": "lib",
},
lib_source = "@com_github_leethomason_tinyxml2//:all",
linkopts = select({
"//bazel:windows_x86_64": ["-lpthread"],
"//conditions:default": [],
}),
out_static_libs = select({
"//bazel:windows_x86_64": ["tinyxml2.lib"],
"//conditions:default": ["libtinyxml2.a"],
}),
)
11 changes: 11 additions & 0 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ def envoy_dependencies(skip_targets = []):
_com_github_tencent_rapidjson()
_com_github_nlohmann_json()
_com_github_ncopa_suexec()
_com_github_leethomason_tinyxml2()
_com_google_absl()
_com_google_googletest()
_com_google_protobuf()
Expand Down Expand Up @@ -758,6 +759,16 @@ def _com_github_nlohmann_json():
actual = "@com_github_nlohmann_json//:json",
)

def _com_github_leethomason_tinyxml2():
external_http_archive(
name = "com_github_leethomason_tinyxml2",
build_file_content = BUILD_ALL_CONTENT,
)
native.bind(
name = "tinyxml2",
actual = "@envoy//bazel/foreign_cc:tinyxml2",
)

def _com_github_nodejs_http_parser():
native.bind(
name = "http_parser",
Expand Down
17 changes: 17 additions & 0 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,23 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "MIT",
license_url = "https://github.com/ncopa/su-exec/blob/{version}/LICENSE",
),
com_github_leethomason_tinyxml2 = dict(
project_name = "TinyXML-2",
project_desc = "Simple, small, efficient, C++ XML parser that can be easily integrated into other programs.",
project_url = "https://github.com/leethomason/tinyxml2",
version = "9.0.0",
sha256 = "cc2f1417c308b1f6acc54f88eb70771a0bf65f76282ce5c40e54cfe52952702c",
strip_prefix = "tinyxml2-{version}",
urls = ["https://github.com/leethomason/tinyxml2/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],
extensions = [
"envoy.filters.http.aws_lambda",
"envoy.filters.http.aws_request_signing",
"envoy.grpc_credentials.aws_iam",
],
release_date = "2021-06-06",
cpe = "cpe:2.3:a:tinyxml2_project:tinyxml2:*",
),
com_google_googletest = dict(
project_name = "Google Test",
project_desc = "Google's C++ test framework",
Expand Down