ilot/onlyoffice-document-server
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix core patch
Some checks failed
/ test-build (pull_request) Failing after 5m51s
Details

Browse source
This commit is contained in:
Antoine Martin 2024-08-24 15:41:37 -04:00
parent 459ecc1486
commit 2d73ea6e06
Signed by: ayakael
GPG key ID: D62A472A4AA7D541
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core_v8-no-enum-constexrp-conversion.patch
View file

@ -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",
+ "-Wno-enum-constexpr-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",
+
# 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"]
+ base.cmd("patch", ["-p1", "-i", "../../v8/tools/no-enum-constexrp-conversion.patch"])
+
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"])