1
0
Fork 0
mirror of https://github.com/rubyjs/libv8 synced 2023-03-27 23:21:48 -04:00

Update the patchset for use against v5

This commit is contained in:
Petko Bordjukov 2016-05-03 16:28:41 +03:00
parent 7e91e82f37
commit bc2dc3ff96
3 changed files with 54 additions and 16 deletions

View file

@ -1,9 +1,9 @@
diff --git a/build/standalone.gypi b/build/standalone.gypi
index b6519c4..ef9e7c5 100644
index a71ed95..308a7e3 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -373,6 +373,9 @@
}],
@@ -476,6 +476,9 @@
}], # fastbuild!=0
],
'target_conditions': [
+ ['_type=="static_library"', {

View file

@ -1,27 +1,65 @@
diff --git a/Makefile b/Makefile
index 9761265..80169b2 100644
index 4fb6ee0..549ae58 100644
--- a/Makefile
+++ b/Makefile
@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64
@@ -251,11 +251,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 \
- test/cctest/cctest.gyp \
- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
- test/unittests/unittests.gyp tools/gyp/v8.gyp \
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 \
- 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 \
+ tools/gyp/v8.gyp tools/parser-shell.gyp \
+ buildtools/third_party/libc++abi/libc++abi.gyp \
+ buildtools/third_party/libc++/libc++.gyp \
src/third_party/vtune/v8vtune.gyp src/d8.gyp
# If vtunejit=on, the v8vtune.gyp will be appended.
diff --git a/build/all.gyp b/build/all.gyp
index 4aeb507..1ff2c7a 100644
index feaf4fe..96820a0 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -10,8 +10,6 @@
@@ -8,11 +8,7 @@
'target_name': 'All',
'type': 'none',
'dependencies': [
'../samples/samples.gyp:*',
- '../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 @@
'../tools/parser-shell.gyp:parser-shell',
],
}],
- ['test_isolation_mode != "noop"', {
- 'dependencies': [
- '../test/bot_default.gyp:*',
- '../test/benchmarks/benchmarks.gyp:*',
- '../test/default.gyp:*',
- '../test/ignition.gyp:*',
- '../test/intl/intl.gyp:*',
- '../test/message/message.gyp:*',
- '../test/mjsunit/mjsunit.gyp:*',
- '../test/mozilla/mozilla.gyp:*',
- '../test/optimize_for_size.gyp:*',
- '../test/perf.gyp:*',
- '../test/preparser/preparser.gyp:*',
- '../test/simdjs/simdjs.gyp:*',
- '../test/test262/test262.gyp:*',
- '../test/webkit/webkit.gyp:*',
- '../tools/check-static-initializers.gyp:*',
- '../tools/gcmole/run_gcmole.gyp:*',
- '../tools/jsfunfuzz/jsfunfuzz.gyp:*',
- '../tools/run-deopt-fuzzer.gyp:*',
- '../tools/run-valgrind.gyp:*',
- ],
- }],
]
}
]

View file

@ -1,8 +1,8 @@
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 7670e5b..230518c 100644
index 1252094..308a7e3 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -205,7 +205,7 @@
@@ -733,7 +733,7 @@
[ 'visibility=="hidden" and v8_enable_backtrace==0', {
'cflags': [ '-fvisibility=hidden' ],
}],
@ -10,4 +10,4 @@ index 7670e5b..230518c 100644
+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', {
'cflags': [ '-fPIC', ],
}],
],
[ 'coverage==1', {