mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 01:20:40 +00:00
98 lines
3.5 KiB
Diff
98 lines
3.5 KiB
Diff
|
From c9f42d1314c6026efcfcc01824f4e2fdfd05ebcf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ben Sklaroff <bsklaroff@gmail.com>
|
||
|
|
Date: Sat, 23 Jul 2016 18:16:55 -0400
|
||
|
|
Subject: [PATCH] libv8-5.4.232
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile | 5 +----
|
||
|
|
gypfiles/all.gyp | 32 --------------------------------
|
||
|
|
gypfiles/standalone.gypi | 5 ++++-
|
||
|
|
3 files changed, 5 insertions(+), 37 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 5ea5c58..d1b2d73 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -261,11 +261,8 @@ 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 src/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 \
|
||
|
|
+ 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/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:*',
|
||
|
|
- '../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:*',
|
||
|
|
- ],
|
||
|
|
- }],
|
||
|
|
]
|
||
|
|
}
|
||
|
|
]
|
||
|
|
diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
|
||
|
|
index 89f06a0..a43976d 100644
|
||
|
|
--- a/gypfiles/standalone.gypi
|
||
|
|
+++ b/gypfiles/standalone.gypi
|
||
|
|
@@ -506,6 +506,9 @@
|
||
|
|
}], # fastbuild!=0
|
||
|
|
],
|
||
|
|
'target_conditions': [
|
||
|
|
+ ['_type=="static_library"', {
|
||
|
|
+ 'standalone_static_library': 1,
|
||
|
|
+ }],
|
||
|
|
['v8_code == 0', {
|
||
|
|
'defines!': [
|
||
|
|
'DEBUG',
|
||
|
|
@@ -770,7 +773,7 @@
|
||
|
|
[ 'visibility=="hidden" and v8_enable_backtrace==0', {
|
||
|
|
'cflags': [ '-fvisibility=hidden' ],
|
||
|
|
}],
|
||
|
|
- [ 'component=="shared_library"', {
|
||
|
|
+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64" or v8_target_arch=="arm")', {
|
||
|
|
'cflags': [ '-fPIC', ],
|
||
|
|
}],
|
||
|
|
[ 'clang==0 and coverage==1', {
|
||
|
|
--
|
||
|
|
2.9.0
|
||
|
|
|