Merge branch '6.0'

CHANGELOG.md

@@ -1,9 +1,11 @@
-### v5.9.211.38.0beta1 - Unreleased
+### v6.0.286.54.0 - Unreleased
 
-* Update upstream v8 version to 6.0.286.44
+* Update upstream v8 version to 6.0.286.54
 * V8 source is no longer pulled using the fetch command from depot_tools but is
   instead added as a submodule in the current tree
 * Hooks are no longer ran after syncing V8's upstream dependencies
+* Reordered libraries in accordance with the V8 wiki
+* Added groups around the library flags in accordance with the V8 wiki
 
 ### v5.9.211.38.0, v5.9.211.38.1 - 2017-07-26
 

ext/libv8/location.rb

@@ -29,7 +29,7 @@ def install!
 
       def configure(context = MkmfContext.new)
         context.incflags.insert 0, Libv8::Paths.include_paths.map{ |p| "-I#{p}" }.join(" ")  + " "
-        context.ldflags.insert 0, Libv8::Paths.object_paths.join(" ") + " "
+        context.ldflags.insert 0, "-Wl,--start-group " + Libv8::Paths.object_paths.join(" ") + " -Wl,--end-group "
       end
 
       def verify_installation!

ext/libv8/paths.rb

@@ -11,7 +11,7 @@ def include_paths
     end
 
     def object_paths
-      [:base, :libplatform, :libsampler, :libbase, :snapshot].map do |name|
+      [:base, :libbase, :snapshot, :libplatform, :libsampler].map do |name|
         Shellwords.escape libv8_object(name)
       end
     end

lib/libv8/version.rb

@@ -1,3 +1,3 @@
 module Libv8
-  VERSION = "6.0.286.44.0beta1"
+  VERSION = "6.0.286.54.0beta1"
 end

patches/0001-Build-a-standalone-static-library.patch

@@ -1,4 +1,4 @@
-From b3d75137651a41d141c29c55725bc97485b247d8 Mon Sep 17 00:00:00 2001
+From 6c28fb0319c5e2e7afad4b5731fc0ded86e1f7e7 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <[email protected]>
 Date: Mon, 25 Jul 2016 00:00:19 +0300
 Subject: [PATCH 1/5] Build a standalone static library

patches/0002-Don-t-compile-unnecessary-stuff.patch

@@ -1,18 +1,18 @@
-From 45000acd2fe5ccf48d1061f76eea2333524ebe74 Mon Sep 17 00:00:00 2001
+From 31d199f67ff88be5576869abcc23ecf219fa1e6f Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <[email protected]>
-Date: Tue, 28 Feb 2017 00:04:26 +0200
+Date: Fri, 28 Jul 2017 11:11:08 +0300
 Subject: [PATCH 2/5] Don't compile unnecessary stuff
 
 ---
- Makefile         | 14 ++++----------
+ Makefile         | 12 +++---------
  gypfiles/all.gyp | 33 ---------------------------------
- 2 files changed, 4 insertions(+), 43 deletions(-)
+ 2 files changed, 3 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ed5b3a7fab..360dc3a1a1 100644
+index ed5b3a7fab..04eddb5e8a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -265,16 +265,10 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
+@@ -265,15 +265,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
  		 android_mipsel android_x87
 
  # List of files that trigger Makefile regeneration:
@@ -25,14 +25,12 @@ index ed5b3a7fab..360dc3a1a1 100644
 -	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
 -	   buildtools/third_party/libc++abi/libc++abi.gyp \
 -	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
--	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
 +GYPFILES = gypfiles/shim_headers.gypi gypfiles/features.gypi \
-+           gypfiles/standalone.gypi gypfiles/toolchain.gypi \
-+           gypfiles/all.gyp gypfiles/mac/asan.gyp \
-+	   tools/parser-shell.gyp src/d8.gyp
++           gypfiles/standalone.gypi gypfiles/all.gyp \
++	   gypfiles/mac/asan.gyp src/v8.gyp tools/parser-shell.gyp \
+ 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
 
  # If vtunejit=on, the v8vtune.gyp will be appended.
- ifeq ($(vtunejit), on)
 diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
 index bc9d9650eb..96820a0ecc 100644
 --- a/gypfiles/all.gyp

patches/0003-Use-the-fPIC-flag-for-the-static-library.patch

@@ -1,4 +1,4 @@
-From 185c0249653dafb4ae20d21f2a0cc241c3e96c64 Mon Sep 17 00:00:00 2001
+From fe76837b00357250a01ad71c4cce4b7524dd765f Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <[email protected]>
 Date: Mon, 25 Jul 2016 00:05:47 +0300
 Subject: [PATCH 3/5] Use the -fPIC flag for the static library

patches/0004-Do-not-embed-debug-symbols-in-macOS-libraries.patch

@@ -1,4 +1,4 @@
-From 596e88c9c1a158abc878bd81112aa9b5ec38033a Mon Sep 17 00:00:00 2001
+From 7b00cf7c2c13d4c528bccd3bc4a91426f4e35145 Mon Sep 17 00:00:00 2001
 From: Jb Aviat <[email protected]>
 Date: Mon, 27 Feb 2017 11:14:42 +0200
 Subject: [PATCH 4/5] Do not embed debug symbols in macOS libraries

patches/0005-Fix-GCC-7-build-errors.patch

@@ -1,4 +1,4 @@
-From da4cfa16ed1cbbc5e2ecfeecb64cbe939029ff36 Mon Sep 17 00:00:00 2001
+From a8f772b3a6bcfad871b4d09935727032faf84df2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <[email protected]>
 Date: Tue, 20 Jun 2017 13:14:38 +0200
 Subject: [PATCH 5/5] Fix GCC 7 build errors

spec/location_spec.rb

@@ -64,7 +64,7 @@
     end
 
     it "prepends the locations of any libv8 objects on the the ldflags" do
-      expect(@context.ldflags).to eql "/foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libplatform.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libsampler.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libbase.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a -lobjc -lpthread"
+      expect(@context.ldflags).to eql "-Wl,--start-group /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libbase.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libplatform.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libsampler.a -Wl,--end-group -lobjc -lpthread"
     end
   end
 end