From 2d73ea6e06b1213acc7f19a7f6300a1c5aaa81ac Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 24 Aug 2024 15:41:37 -0400 Subject: [PATCH] fix core patch --- core_v8-no-enum-constexrp-conversion.patch | 44 ++++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/core_v8-no-enum-constexrp-conversion.patch b/core_v8-no-enum-constexrp-conversion.patch index e70a055..931fce2 100644 --- a/core_v8-no-enum-constexrp-conversion.patch +++ b/core_v8-no-enum-constexrp-conversion.patch @@ -1,14 +1,34 @@ -diff --git a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn b/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn -index 5ea2f213..29fa7742 100644 ---- a/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn -+++ b/core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn -@@ -1548,6 +1548,9 @@ config("default_warnings") { - # TODO(https://crbug.com/989932): Evaluate and possibly enable. - "-Wno-implicit-int-float-conversion", +diff --git a/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch +new file mode 100644 +index 0000000000..5a1a8067a6 +--- /dev/null ++++ b/core/Common/3dParty/v8/tools/no-enum-constexrp-conversion.patch +@@ -0,0 +1,14 @@ ++diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn ++index 5ea2f213..29fa7742 100644 ++--- a/build/config/compiler/BUILD.gn +++++ b/build/config/compiler/BUILD.gn ++@@ -1548,6 +1548,9 @@ config("default_warnings") { ++ # TODO(https://crbug.com/989932): Evaluate and possibly enable. ++ "-Wno-implicit-int-float-conversion", ++ +++ "-Wno-enum-constexpr-conversion", +++ +++ ++ # TODO(https://crbug.com/999886): Clean up, enable. ++ "-Wno-final-dtor-non-final-class", ++ +diff --git a/core/scripts/core_common/modules/v8_89.py b/core/scripts/core_common/modules/v8_89.py +index 9643263..35ee1fe 100644 +--- a/core/scripts/core_common/modules/v8_89.py ++++ b/core/scripts/core_common/modules/v8_89.py +@@ -150,6 +150,8 @@ def make(): + "use_custom_libcxx=false", + "treat_warnings_as_errors=false"] -+ "-Wno-enum-constexpr-conversion", ++ base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"]) + -+ - # TODO(https://crbug.com/999886): Clean up, enable. - "-Wno-final-dtor-non-final-class", - + if config.check_option("platform", "linux_64"): + base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")]) + base.cmd("ninja", ["-C", "out.gn/linux_64"]) +