From 18537c3c53bea89c3940ef89d7727f6edb000725 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Mon, 25 Jul 2016 00:08:15 +0300 Subject: [PATCH] Bump upstream version to 5.2.361.43 and update patches --- lib/libv8/version.rb | 2 +- ...01-Build-a-standalone-static-library.patch | 26 ++++++++ ...0001-Build-standalone-static-library.patch | 26 -------- ...002-Don-t-compile-unnecessary-stuff.patch} | 65 +++++++++---------- ...the-fPIC-flag-for-the-static-library.patch | 18 ++--- vendor/depot_tools | 2 +- 6 files changed, 68 insertions(+), 71 deletions(-) create mode 100644 patches/0001-Build-a-standalone-static-library.patch delete mode 100644 patches/0001-Build-standalone-static-library.patch rename patches/{0002-Disable-building-tests.patch => 0002-Don-t-compile-unnecessary-stuff.patch} (52%) diff --git a/lib/libv8/version.rb b/lib/libv8/version.rb index 68d4f15..feaa1a5 100644 --- a/lib/libv8/version.rb +++ b/lib/libv8/version.rb @@ -1,3 +1,3 @@ module Libv8 - VERSION = "5.1.281.67.0" + VERSION = "5.2.361.43.0" end diff --git a/patches/0001-Build-a-standalone-static-library.patch b/patches/0001-Build-a-standalone-static-library.patch new file mode 100644 index 0000000..edd3c28 --- /dev/null +++ b/patches/0001-Build-a-standalone-static-library.patch @@ -0,0 +1,26 @@ +From 9aa7780d5c7434706ba12b81ab021e0db9850982 Mon Sep 17 00:00:00 2001 +From: Petko Bordjukov +Date: Mon, 25 Jul 2016 00:00:19 +0300 +Subject: [PATCH 1/3] Build a standalone static library + +--- + gypfiles/standalone.gypi | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi +index 630c45e..1a69c6f 100644 +--- a/gypfiles/standalone.gypi ++++ b/gypfiles/standalone.gypi +@@ -488,6 +488,9 @@ + }], # fastbuild!=0 + ], + 'target_conditions': [ ++ ['_type=="static_library"', { ++ 'standalone_static_library': 1, ++ }], + ['v8_code == 0', { + 'defines!': [ + 'DEBUG', +-- +2.9.0 + diff --git a/patches/0001-Build-standalone-static-library.patch b/patches/0001-Build-standalone-static-library.patch deleted file mode 100644 index db4e5ff..0000000 --- a/patches/0001-Build-standalone-static-library.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 91326a79ff71b9f856585bf8dfdc112527801e68 Mon Sep 17 00:00:00 2001 -From: Petko Bordjukov -Date: Fri, 10 Jun 2016 08:51:08 +0300 -Subject: [PATCH 1/3] Build standalone static library - ---- - build/standalone.gypi | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 6c88409..4f10909 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -471,6 +471,9 @@ - }], # fastbuild!=0 - ], - 'target_conditions': [ -+ ['_type=="static_library"', { -+ 'standalone_static_library': 1, -+ }], - ['v8_code == 0', { - 'defines!': [ - 'DEBUG', --- -2.8.3 - diff --git a/patches/0002-Disable-building-tests.patch b/patches/0002-Don-t-compile-unnecessary-stuff.patch similarity index 52% rename from patches/0002-Disable-building-tests.patch rename to patches/0002-Don-t-compile-unnecessary-stuff.patch index c5a67e2..d03ce9e 100644 --- a/patches/0002-Disable-building-tests.patch +++ b/patches/0002-Don-t-compile-unnecessary-stuff.patch @@ -1,51 +1,48 @@ -From a27a92cbe9db50bceedfffeb43d12345209e4d75 Mon Sep 17 00:00:00 2001 +From bb7beaa8dddf7d406de80cc6511abe942dfeabd6 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov -Date: Fri, 10 Jun 2016 08:57:29 +0300 -Subject: [PATCH 2/3] Disable building tests +Date: Mon, 25 Jul 2016 00:04:07 +0300 +Subject: [PATCH 2/3] Don't compile unnecessary stuff --- - Makefile | 6 ++---- - build/all.gyp | 27 --------------------------- - 2 files changed, 2 insertions(+), 31 deletions(-) + Makefile | 7 +------ + gypfiles/all.gyp | 32 -------------------------------- + 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/Makefile b/Makefile -index a0c08a6..10b2924 100644 +index 0f8f93a..68778e9 100644 --- a/Makefile +++ b/Makefile -@@ -258,11 +258,9 @@ NACL_ARCHES = nacl_ia32 nacl_x64 - GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ - build/shim_headers.gypi build/features.gypi build/standalone.gypi \ - build/toolchain.gypi build/all.gyp build/mac/asan.gyp \ +@@ -264,12 +264,7 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ + gypfiles/shim_headers.gypi gypfiles/features.gypi \ + gypfiles/standalone.gypi \ + gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \ - test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \ -- test/unittests/unittests.gyp tools/gyp/v8.gyp \ +- test/unittests/unittests.gyp src/v8.gyp \ - tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ -+ tools/gyp/v8.gyp tools/parser-shell.gyp \ - buildtools/third_party/libc++abi/libc++abi.gyp \ +- buildtools/third_party/libc++abi/libc++abi.gyp \ - buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ -+ buildtools/third_party/libc++/libc++.gyp \ - src/third_party/vtune/v8vtune.gyp src/d8.gyp +- src/third_party/vtune/v8vtune.gyp src/d8.gyp ++ src/v8.gyp tools/parser-shell.gyp src/d8.gyp # If vtunejit=on, the v8vtune.gyp will be appended. -diff --git a/build/all.gyp b/build/all.gyp -index feaf4fe..96820a0 100644 ---- a/build/all.gyp -+++ b/build/all.gyp -@@ -8,11 +8,7 @@ - 'target_name': 'All', - 'type': 'none', - 'dependencies': [ -- '../samples/samples.gyp:*', - '../src/d8.gyp:d8', -- '../test/cctest/cctest.gyp:*', -- '../test/fuzzer/fuzzer.gyp:*', -- '../test/unittests/unittests.gyp:*', - ], - 'conditions': [ - ['component!="shared_library"', { -@@ -20,29 +16,6 @@ + ifeq ($(vtunejit), on) +diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp +index ff1bea4..96820a0 100644 +--- a/gypfiles/all.gyp ++++ b/gypfiles/all.gyp +@@ -16,38 +16,6 @@ '../tools/parser-shell.gyp:parser-shell', ], }], +- # These items don't compile for Android on Mac. +- ['host_os!="mac" or OS!="android"', { +- 'dependencies': [ +- '../samples/samples.gyp:*', +- '../test/cctest/cctest.gyp:*', +- '../test/fuzzer/fuzzer.gyp:*', +- '../test/unittests/unittests.gyp:*', +- ], +- }], - ['test_isolation_mode != "noop"', { - 'dependencies': [ - '../test/bot_default.gyp:*', @@ -73,5 +70,5 @@ index feaf4fe..96820a0 100644 } ] -- -2.8.3 +2.9.0 diff --git a/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch b/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch index e69f55a..81d0777 100644 --- a/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch +++ b/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch @@ -1,17 +1,17 @@ -From 8c92844ee381fc2074204dd52ca3668e3c6fe89f Mon Sep 17 00:00:00 2001 +From 22cd3f03af2d94da1f7506a8daa7708e8c93b928 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov -Date: Fri, 10 Jun 2016 08:58:29 +0300 +Date: Mon, 25 Jul 2016 00:05:47 +0300 Subject: [PATCH 3/3] Use the -fPIC flag for the static library --- - build/standalone.gypi | 2 +- + gypfiles/standalone.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/standalone.gypi b/build/standalone.gypi -index 4f10909..3a67af3 100644 ---- a/build/standalone.gypi -+++ b/build/standalone.gypi -@@ -728,7 +728,7 @@ +diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi +index 1a69c6f..b19304f 100644 +--- a/gypfiles/standalone.gypi ++++ b/gypfiles/standalone.gypi +@@ -744,7 +744,7 @@ [ 'visibility=="hidden" and v8_enable_backtrace==0', { 'cflags': [ '-fvisibility=hidden' ], }], @@ -21,5 +21,5 @@ index 4f10909..3a67af3 100644 }], [ 'clang==0 and coverage==1', { -- -2.8.3 +2.9.0 diff --git a/vendor/depot_tools b/vendor/depot_tools index 97e8e55..8697dfc 160000 --- a/vendor/depot_tools +++ b/vendor/depot_tools @@ -1 +1 @@ -Subproject commit 97e8e55968769e9e455ee8f28abe1a036b32837b +Subproject commit 8697dfcf8b85fbad2cc8eee370063b5b4113eaeb