From d61e2a382d0ee06eb8eeb67ec4ff917e8b9d8462 Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 14 Jul 2020 16:31:43 -0400 Subject: [PATCH 1/2] update to 8.4.371.19 This requires changing our checkout strategy to check out the branch-heads branch (as documented at https://v8.dev/docs/version-numbers) instead of using the 8.4.371 branch, which never gets patches (it's always locked to 8.4.371.0). We could also specify the v8 patch version manually, and i'm open to doing that, just wanted to do this to get it working. --- ext/libv8/builder.rb | 4 ++-- lib/libv8/version.rb | 3 ++- vendor/depot_tools | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/libv8/builder.rb b/ext/libv8/builder.rb index 88716d55..a767ceca 100644 --- a/ext/libv8/builder.rb +++ b/ext/libv8/builder.rb @@ -65,7 +65,7 @@ def setup_python! # then this will be 4.5.95 # def source_version - Libv8::VERSION.gsub(/\.[^.]+$/, '') + Libv8::V8_MINOR_VERSION end ## @@ -84,7 +84,7 @@ def setup_build_deps! Dir.chdir('v8') do system 'git fetch origin' - unless system "git checkout #{source_version}" + unless system "git checkout branch-heads/#{source_version}" fail "unable to checkout source for v8 #{source_version}" end system "gclient sync" or fail "could not sync v8 build dependencies" diff --git a/lib/libv8/version.rb b/lib/libv8/version.rb index 54025723..ddd4ee06 100644 --- a/lib/libv8/version.rb +++ b/lib/libv8/version.rb @@ -1,3 +1,4 @@ module Libv8 - VERSION = "7.3.495.0" + V8_MINOR_VERSION = "8.4" + VERSION = "8.4.371.0" end diff --git a/vendor/depot_tools b/vendor/depot_tools index 9c062012..3229d944 160000 --- a/vendor/depot_tools +++ b/vendor/depot_tools @@ -1 +1 @@ -Subproject commit 9c0620120980e4c247ff8325ee8bbdcd4d9576e0 +Subproject commit 3229d944bfb4bc5983785f49cbc58f78872d8cb8 From 681a8404edffa04c024bf459889ef6bde49f74bb Mon Sep 17 00:00:00 2001 From: evan Date: Wed, 15 Jul 2020 12:32:36 -0400 Subject: [PATCH 2/2] Use last good version before build error Using bisect, I was able to find that the build error was introduced in https://github.com/v8/v8/commit/5bbca548e9841d25645e0ed077638b1d96bd1f07, so let's use the version before that one while we wait for upstream to merge the patch (https://bugs.chromium.org/p/v8/issues/detail?id=10708) --- ext/libv8/builder.rb | 4 ++-- lib/libv8/version.rb | 3 +-- vendor/depot_tools | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ext/libv8/builder.rb b/ext/libv8/builder.rb index a767ceca..88716d55 100644 --- a/ext/libv8/builder.rb +++ b/ext/libv8/builder.rb @@ -65,7 +65,7 @@ def setup_python! # then this will be 4.5.95 # def source_version - Libv8::V8_MINOR_VERSION + Libv8::VERSION.gsub(/\.[^.]+$/, '') end ## @@ -84,7 +84,7 @@ def setup_build_deps! Dir.chdir('v8') do system 'git fetch origin' - unless system "git checkout branch-heads/#{source_version}" + unless system "git checkout #{source_version}" fail "unable to checkout source for v8 #{source_version}" end system "gclient sync" or fail "could not sync v8 build dependencies" diff --git a/lib/libv8/version.rb b/lib/libv8/version.rb index ddd4ee06..62cee7b5 100644 --- a/lib/libv8/version.rb +++ b/lib/libv8/version.rb @@ -1,4 +1,3 @@ module Libv8 - V8_MINOR_VERSION = "8.4" - VERSION = "8.4.371.0" + VERSION = "8.4.255.0" end diff --git a/vendor/depot_tools b/vendor/depot_tools index 3229d944..9d9199a5 160000 --- a/vendor/depot_tools +++ b/vendor/depot_tools @@ -1 +1 @@ -Subproject commit 3229d944bfb4bc5983785f49cbc58f78872d8cb8 +Subproject commit 9d9199a509bf792d7d24ac91d92ed0d111f8d9fb