Skip to content

Update wasmtime + proxy-wasm-cpp-host #36880

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
wants to merge 1 commit into from
Closed

Update wasmtime + proxy-wasm-cpp-host #36880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions bazel/external/wasm-c-api.BUILD
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions bazel/external/wasmtime.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ licenses(["notice"]) # Apache 2

package(default_visibility = ["//visibility:public"])

cc_library(
name = "wasmtime_lib",
hdrs = [
"crates/c-api/include/wasm.h",
],
deps = [
":rust_c_api",
],
)

cc_library(
name = "helpers_lib",
srcs = [
Expand Down
10 changes: 2 additions & 8 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ def envoy_dependencies(skip_targets = []):

_com_github_wamr()
_com_github_wasmtime()
_com_github_wasm_c_api()

switched_rules_by_language(
name = "com_google_googleapis_imports",
Expand Down Expand Up @@ -885,21 +884,16 @@ def _com_github_wasmtime():
build_file = "@envoy//bazel/external:wasmtime.BUILD",
)

def _com_github_wasm_c_api():
external_http_archive(
name = "com_github_wasm_c_api",
build_file = "@envoy//bazel/external:wasm-c-api.BUILD",
)
native.bind(
name = "wasmtime",
actual = "@com_github_wasm_c_api//:wasmtime_lib",
actual = "@com_github_wasmtime//:wasmtime_lib",
)

# This isn't needed in builds with a single Wasm engine, but "bazel query"
# complains about a missing dependency, so point it at the regular target.
native.bind(
name = "prefixed_wasmtime",
actual = "@com_github_wasm_c_api//:wasmtime_lib",
actual = "@com_github_wasmtime//:wasmtime_lib",
)

def _intel_dlb():
Expand Down
17 changes: 0 additions & 17 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,23 +1137,6 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "Apache-2.0",
license_url = "https://github.com/bytecodealliance/wasmtime/blob/v{version}/LICENSE",
),
com_github_wasm_c_api = dict(
project_name = "wasm-c-api",
project_desc = "WebAssembly C and C++ API",
project_url = "https://github.com/WebAssembly/wasm-c-api",
# this is the submodule's specific commit used by wasmtime
# https://github.com/bytecodealliance/wasmtime/tree/v0.25.0/crates/c-api
version = "c9d31284651b975f05ac27cee0bab1377560b87e",
sha256 = "c774044f51431429e878bd1b9e2a4e38932f861f9211df72f75e9427eb6b8d32",
strip_prefix = "wasm-c-api-{version}",
urls = ["https://github.com/WebAssembly/wasm-c-api/archive/{version}.tar.gz"],
release_date = "2021-01-11",
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wasmtime"],
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/WebAssembly/wasm-c-api/blob/{version}/LICENSE",
),
io_opencensus_cpp = dict(
project_name = "OpenCensus C++",
project_desc = "OpenCensus tracing library",
Expand Down