Skip to content

Commit

Permalink
Merge v8 patch from envoyproxy/envoy/pull/29425 (#383)
Browse files Browse the repository at this point in the history
This is a temporary build fix until pr#382 lands.

Signed-off-by: Martijn Stevenson <mstevenson@google.com>
  • Loading branch information
martijneken authored Jan 29, 2024
1 parent e200fee commit 9be9637
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 1 deletion.
41 changes: 41 additions & 0 deletions bazel/external/v8_include.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# fix include types for late clang (15.0.7) / gcc (13.2.1)
# for Arch linux / Fedora, like in
# In file included from external/v8/src/torque/torque.cc:5:
# In file included from external/v8/src/torque/source-positions.h:10:
# In file included from external/v8/src/torque/contextual.h:10:
# In file included from external/v8/src/base/macros.h:12:
# external/v8/src/base/logging.h:154:26: error: use of undeclared identifier 'uint16_t'

diff --git a/src/base/logging.h b/src/base/logging.h
--- a/src/base/logging.h
+++ b/src/base/logging.h
@@ -5,6 +5,7 @@
#ifndef V8_BASE_LOGGING_H_
#define V8_BASE_LOGGING_H_

+#include <cstdint>
#include <cstring>
#include <sstream>
#include <string>
diff --git a/src/base/macros.h b/src/base/macros.h
--- a/src/base/macros.h
+++ b/src/base/macros.h
@@ -5,6 +5,7 @@
#ifndef V8_BASE_MACROS_H_
#define V8_BASE_MACROS_H_

+#include <cstdint>
#include <limits>
#include <type_traits>

diff --git a/src/inspector/v8-string-conversions.h b/src/inspector/v8-string-conversions.h
--- a/src/inspector/v8-string-conversions.h
+++ b/src/inspector/v8-string-conversions.h
@@ -5,6 +5,7 @@
#ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
#define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_

+#include <cstdint>
#include <string>

// Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
5 changes: 4 additions & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ def proxy_wasm_cpp_host_repositories():
commit = "6c8b357a84847a479cd329478522feefc1c3195a",
remote = "https://chromium.googlesource.com/v8/v8",
shallow_since = "1664374400 +0000",
patches = ["@proxy_wasm_cpp_host//bazel/external:v8.patch"],
patches = [
"@proxy_wasm_cpp_host//bazel/external:v8.patch",
"@proxy_wasm_cpp_host//bazel/external:v8_include.patch",
],
patch_args = ["-p1"],
)

Expand Down

0 comments on commit 9be9637

Please sign in to comment.