Skip to content

Commit 9be9637

Browse files
authored
Merge v8 patch from envoyproxy/envoy/pull/29425 (#383)
This is a temporary build fix until pr#382 lands. Signed-off-by: Martijn Stevenson <[email protected]>
1 parent e200fee commit 9be9637

File tree

2 files changed

+45
-1
lines changed

2 files changed

+45
-1
lines changed

Diff for: bazel/external/v8_include.patch

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# fix include types for late clang (15.0.7) / gcc (13.2.1)
2+
# for Arch linux / Fedora, like in
3+
# In file included from external/v8/src/torque/torque.cc:5:
4+
# In file included from external/v8/src/torque/source-positions.h:10:
5+
# In file included from external/v8/src/torque/contextual.h:10:
6+
# In file included from external/v8/src/base/macros.h:12:
7+
# external/v8/src/base/logging.h:154:26: error: use of undeclared identifier 'uint16_t'
8+
9+
diff --git a/src/base/logging.h b/src/base/logging.h
10+
--- a/src/base/logging.h
11+
+++ b/src/base/logging.h
12+
@@ -5,6 +5,7 @@
13+
#ifndef V8_BASE_LOGGING_H_
14+
#define V8_BASE_LOGGING_H_
15+
16+
+#include <cstdint>
17+
#include <cstring>
18+
#include <sstream>
19+
#include <string>
20+
diff --git a/src/base/macros.h b/src/base/macros.h
21+
--- a/src/base/macros.h
22+
+++ b/src/base/macros.h
23+
@@ -5,6 +5,7 @@
24+
#ifndef V8_BASE_MACROS_H_
25+
#define V8_BASE_MACROS_H_
26+
27+
+#include <cstdint>
28+
#include <limits>
29+
#include <type_traits>
30+
31+
diff --git a/src/inspector/v8-string-conversions.h b/src/inspector/v8-string-conversions.h
32+
--- a/src/inspector/v8-string-conversions.h
33+
+++ b/src/inspector/v8-string-conversions.h
34+
@@ -5,6 +5,7 @@
35+
#ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
36+
#define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
37+
38+
+#include <cstdint>
39+
#include <string>
40+
41+
// Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may

Diff for: bazel/repositories.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@ def proxy_wasm_cpp_host_repositories():
130130
commit = "6c8b357a84847a479cd329478522feefc1c3195a",
131131
remote = "https://chromium.googlesource.com/v8/v8",
132132
shallow_since = "1664374400 +0000",
133-
patches = ["@proxy_wasm_cpp_host//bazel/external:v8.patch"],
133+
patches = [
134+
"@proxy_wasm_cpp_host//bazel/external:v8.patch",
135+
"@proxy_wasm_cpp_host//bazel/external:v8_include.patch",
136+
],
134137
patch_args = ["-p1"],
135138
)
136139

0 commit comments

Comments
 (0)