Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit aeab929

Browse files
committed
Merge branch '5.1.281.59'
2 parents d52f9fe + 1797175 commit aeab929

File tree

7 files changed

+61
-25
lines changed

7 files changed

+61
-25
lines changed

ext/libv8/patcher.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module Patcher
66

77
def patch!
88
File.open(".applied_patches", File::RDWR|File::CREAT) do |f|
9-
available_patches = Dir.glob(File.join(PATCH_DIRECTORY, '*.patch'))
9+
available_patches = Dir.glob(File.join(PATCH_DIRECTORY, '*.patch')).sort
1010
applied_patches = f.readlines.map(&:chomp)
1111

1212
(available_patches - applied_patches).each do |patch|

lib/libv8/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Libv8
2-
VERSION = "5.0.71.48.5"
2+
VERSION = "5.1.281.59.0dev"
33
end
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 91326a79ff71b9f856585bf8dfdc112527801e68 Mon Sep 17 00:00:00 2001
2+
From: Petko Bordjukov <[email protected]>
3+
Date: Fri, 10 Jun 2016 08:51:08 +0300
4+
Subject: [PATCH 1/3] Build standalone static library
5+
6+
---
7+
build/standalone.gypi | 3 +++
8+
1 file changed, 3 insertions(+)
9+
10+
diff --git a/build/standalone.gypi b/build/standalone.gypi
11+
index 6c88409..4f10909 100644
12+
--- a/build/standalone.gypi
13+
+++ b/build/standalone.gypi
14+
@@ -471,6 +471,9 @@
15+
}], # fastbuild!=0
16+
],
17+
'target_conditions': [
18+
+ ['_type=="static_library"', {
19+
+ 'standalone_static_library': 1,
20+
+ }],
21+
['v8_code == 0', {
22+
'defines!': [
23+
'DEBUG',
24+
--
25+
2.8.3
26+

patches/disable-building-tests.patch renamed to patches/0002-Disable-building-tests.patch

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1+
From a27a92cbe9db50bceedfffeb43d12345209e4d75 Mon Sep 17 00:00:00 2001
2+
From: Petko Bordjukov <[email protected]>
3+
Date: Fri, 10 Jun 2016 08:57:29 +0300
4+
Subject: [PATCH 2/3] Disable building tests
5+
6+
---
7+
Makefile | 6 ++----
8+
build/all.gyp | 27 ---------------------------
9+
2 files changed, 2 insertions(+), 31 deletions(-)
10+
111
diff --git a/Makefile b/Makefile
2-
index 4fb6ee0..549ae58 100644
12+
index a0c08a6..10b2924 100644
313
--- a/Makefile
414
+++ b/Makefile
5-
@@ -251,11 +251,9 @@ NACL_ARCHES = nacl_ia32 nacl_x64
15+
@@ -258,11 +258,9 @@ NACL_ARCHES = nacl_ia32 nacl_x64
616
GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
717
build/shim_headers.gypi build/features.gypi build/standalone.gypi \
818
build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
919
- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
1020
- test/unittests/unittests.gyp tools/gyp/v8.gyp \
1121
- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
12-
- buildtools/third_party/libc++abi/libc++abi.gyp \
13-
- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
1422
+ tools/gyp/v8.gyp tools/parser-shell.gyp \
15-
+ buildtools/third_party/libc++abi/libc++abi.gyp \
23+
buildtools/third_party/libc++abi/libc++abi.gyp \
24+
- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
1625
+ buildtools/third_party/libc++/libc++.gyp \
1726
src/third_party/vtune/v8vtune.gyp src/d8.gyp
1827

@@ -63,3 +72,6 @@ index feaf4fe..96820a0 100644
6372
]
6473
}
6574
]
75+
--
76+
2.8.3
77+
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1+
From 8c92844ee381fc2074204dd52ca3668e3c6fe89f Mon Sep 17 00:00:00 2001
2+
From: Petko Bordjukov <[email protected]>
3+
Date: Fri, 10 Jun 2016 08:58:29 +0300
4+
Subject: [PATCH 3/3] Use the -fPIC flag for the static library
5+
6+
---
7+
build/standalone.gypi | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
110
diff --git a/build/standalone.gypi b/build/standalone.gypi
2-
index 1252094..308a7e3 100644
11+
index 4f10909..3a67af3 100644
312
--- a/build/standalone.gypi
413
+++ b/build/standalone.gypi
5-
@@ -733,7 +733,7 @@
14+
@@ -728,7 +728,7 @@
615
[ 'visibility=="hidden" and v8_enable_backtrace==0', {
716
'cflags': [ '-fvisibility=hidden' ],
817
}],
918
- [ 'component=="shared_library"', {
1019
+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64" or v8_target_arch=="arm")', {
1120
'cflags': [ '-fPIC', ],
1221
}],
13-
[ 'coverage==1', {
22+
[ 'clang==0 and coverage==1', {
23+
--
24+
2.8.3
25+

patches/build-standalone-static-library.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

vendor/depot_tools

Submodule depot_tools updated from 32f9abc to 97e8e55

0 commit comments

Comments
 (0)