Skip to content
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.

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

[v8] Update to stable version 9.1.269.39 #18998

Merged
merged 1 commit into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 22 additions & 22 deletions ports/v8/build.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
index 0c8743726..e6a5ae0b4 100644
index 1904a2559..e66586c88 100644
--- a/config/compiler/BUILD.gn
+++ b/config/compiler/BUILD.gn
@@ -1545,6 +1545,7 @@ config("default_warnings") {
@@ -1571,6 +1571,7 @@ config("default_warnings") {
# Disables.
"-Wno-missing-field-initializers", # "struct foo f = {0};"
"-Wno-unused-parameter", # Unused function parameters.
+ "-Wno-invalid-offsetof", # Use of "conditionally-supported" offsetof in c++17
Kwizatz marked this conversation as resolved.
Show resolved Hide resolved
]
}

@@ -1969,8 +1970,17 @@ config("no_incompatible_pointer_warnings") {
@@ -1987,8 +1988,17 @@ config("no_incompatible_pointer_warnings") {
# Shared settings for both "optimize" and "optimize_max" configs.
# IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags.
if (is_win) {
Expand All @@ -31,7 +31,7 @@ index 0c8743726..e6a5ae0b4 100644
"/Zc:inline", # Remove unreferenced COMDAT (faster links).
]
diff --git a/config/linux/pkg-config.py b/config/linux/pkg-config.py
index 5adf70cc3..dab159f98 100644
index 5adf70cc3..dab159f98 100755
--- a/config/linux/pkg-config.py
+++ b/config/linux/pkg-config.py
@@ -41,6 +41,11 @@ from optparse import OptionParser
Expand All @@ -43,13 +43,13 @@ index 5adf70cc3..dab159f98 100644
+# of the PKG_CONFIG_LIBDIR environment library.
+#
+# --full-path-libs causes lib names to include their full path.


def SetConfigPath(options):
@@ -105,11 +110,32 @@ def RewritePath(path, strip_prefix, sysroot):
return path


+flag_regex = re.compile("(-.)(.+)")
+
+
Expand Down Expand Up @@ -79,7 +79,7 @@ index 5adf70cc3..dab159f98 100644
+ if "linux" not in sys.platform and 'win32' not in sys.platform:
print("[[],[],[],[],[]]")
return 0

@@ -128,6 +154,9 @@ def main():
parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir')
parser.add_option('--version-as-components', action='store_true',
Expand All @@ -88,12 +88,12 @@ index 5adf70cc3..dab159f98 100644
+ type='string')
+ parser.add_option('--full-path-libs', action='store_true', dest='full_path_libs')
(options, args) = parser.parse_args()

# Make a list of regular expressions to strip out.
@@ -144,6 +173,10 @@ def main():
else:
prefix = ''

+ # Override PKG_CONFIG_LIBDIR
+ if options.pkg_config_libdir:
+ os.environ['PKG_CONFIG_LIBDIR'] = options.pkg_config_libdir
Expand All @@ -107,12 +107,12 @@ index 5adf70cc3..dab159f98 100644
# to happen in practice.
- all_flags = flag_string.strip().split(' ')
+ all_flags = ConvertGCCToMSVC(flag_string.strip().split(' '))


sysroot = options.sysroot
@@ -220,7 +253,10 @@ def main():
continue;

if flag[:2] == '-l':
- libs.append(RewritePath(flag[2:], prefix, sysroot))
+ library = RewritePath(flag[2:], prefix, sysroot)
Expand All @@ -125,7 +125,7 @@ index 5adf70cc3..dab159f98 100644
@@ -237,6 +273,14 @@ def main():
else:
cflags.append(flag)

+ if options.full_path_libs:
+ full_path_libs = []
+ for lib_dir in lib_dirs:
Expand All @@ -149,12 +149,12 @@ index 428e44ac0..a0d2175ee 100644
+ # Allow directly overriding the PKG_CONFIG_LIBDIR enviroment variable
+ pkg_config_libdir = ""
}

pkg_config_script = "//build/config/linux/pkg-config.py"
@@ -87,6 +90,17 @@ if (host_pkg_config != "") {
host_pkg_config_args = pkg_config_args
}

+if (pkg_config_libdir != "") {
+ pkg_config_args += [
+ "--pkg_config_libdir",
Expand All @@ -170,10 +170,10 @@ index 428e44ac0..a0d2175ee 100644
assert(defined(invoker.packages),
"Variable |packages| must be defined to be a list in pkg_config.")
diff --git a/util/lastchange.py b/util/lastchange.py
index 874870ad5..a4fc0be8d 100644
index 02a36642b..78934f1b0 100755
--- a/util/lastchange.py
+++ b/util/lastchange.py
@@ -191,7 +191,10 @@ def GetGitTopDirectory(source_dir):
@@ -192,7 +192,10 @@ def GetGitTopDirectory(source_dir):
Returns:
The output of "git rev-parse --show-toplevel" as a string
"""
Expand All @@ -182,6 +182,6 @@ index 874870ad5..a4fc0be8d 100644
+ if "GCC" in sys.version and sys.platform=='win32':
+ return subprocess.check_output(["cygpath", "-w", directory]).strip(b"\n").decode()
+ return directory


def WriteIfChanged(file_name, contents):
6 changes: 3 additions & 3 deletions ports/v8/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

set(pkgver "9.0.257.17")
set(pkgver "9.1.269.39")

set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0)

Expand Down Expand Up @@ -71,15 +71,15 @@ endfunction()
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL https://chromium.googlesource.com/v8/v8.git
REF 462fc27a2892702a4d42ffd647789c58ffcee747
REF 7d3d62c91f69a702e5aa54c6b4dbbaa883683717
PATCHES ${CURRENT_PORT_DIR}/v8.patch
)

message(STATUS "Fetching submodules")
v8_fetch(
DESTINATION build
URL https://chromium.googlesource.com/chromium/src/build.git
REF acacc4cc0668cb4dc7f44a3f4430635f438d7478
REF fd86d60f33cbc794537c4da2ef7e298d7f81138e
SOURCE ${SOURCE_PATH}
PATCHES ${CURRENT_PORT_DIR}/build.patch)
v8_fetch(
Expand Down