Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/DEPS
- +++ b/DEPS
- @@ -5,10 +5,7 @@
- deps = {
- # Remember to keep the revision in sync with the Makefile.
- "v8/build/gyp":
- - "http://gyp.googlecode.com/svn/trunk@1831",
- -
- - "v8/third_party/icu":
- - "https://src.chromium.org/chrome/trunk/deps/third_party/icu46@239289",
- + "http://gyp.googlecode.com/svn/trunk@1836",
- }
- deps_os = {
- --- a/Makefile
- +++ b/Makefile
- @@ -441,7 +441,4 @@ grokdump: ia32.release
- # Remember to keep these in sync with the DEPS file.
- dependencies:
- svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
- - --revision 1831
- - svn checkout --force \
- - https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \
- - third_party/icu --revision 239289
- + --revision 1836
- --- a/build/standalone.gypi
- +++ b/build/standalone.gypi
- @@ -93,7 +93,7 @@
- 'v8_optimized_debug%': 0,
- # Relative path to icu.gyp from this file.
- - 'icu_gyp_path': '../third_party/icu/icu.gyp',
- +# 'icu_gyp_path': '../third_party/icu/icu.gyp',
- 'conditions': [
- ['(v8_target_arch=="arm" and host_arch!="arm") or \
- --- a/samples/samples.gyp
- +++ b/samples/samples.gyp
- @@ -41,15 +41,15 @@
- ],
- 'conditions': [
- ['v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icui18n',
- - '<(icu_gyp_path):icuuc',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licui18n',
- + '-licuuc'
- + ], },
- }],
- ['OS=="win" and v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icudata',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licudata'
- + ], },
- }],
- ],
- },
- --- a/src/d8.gyp
- +++ b/src/d8.gyp
- @@ -81,15 +81,15 @@
- ],
- }],
- ['v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icui18n',
- - '<(icu_gyp_path):icuuc',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licui18n',
- + '-licuuc'
- + ], },
- }],
- ['OS=="win" and v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icudata',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licudata'
- + ], },
- }],
- ],
- },
- --- a/tools/gcmole/gcmole.lua
- +++ b/tools/gcmole/gcmole.lua
- @@ -105,8 +105,8 @@ local function MakeClangCommandLine(plugin, plugin_args, triple, arch_define)
- .. " -DENABLE_DEBUGGER_SUPPORT"
- .. " -DV8_I18N_SUPPORT"
- .. " -Isrc"
- - .. " -Ithird_party/icu/source/common"
- - .. " -Ithird_party/icu/source/i18n"
- +-- .. " -Ithird_party/icu/source/common"
- +-- .. " -Ithird_party/icu/source/i18n"
- end
- function InvokeClangPluginForEachFile(filenames, cfg, func)
- --- a/tools/gyp/v8.gyp
- +++ b/tools/gyp/v8.gyp
- @@ -952,10 +952,10 @@
- ]
- }],
- ['v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icui18n',
- - '<(icu_gyp_path):icuuc',
- - ]
- + 'link_settings': { 'libraries': [
- + '-licui18n',
- + '-licuuc'
- + ], },
- }, { # v8_enable_i18n_support==0
- 'sources!': [
- '../../src/i18n.cc',
- @@ -963,9 +963,9 @@
- ],
- }],
- ['OS=="win" and v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icudata',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licudata'
- + ], },
- }],
- ['v8_use_default_platform==0', {
- 'sources!': [
- --- a/tools/lexer-shell.gyp
- +++ b/tools/lexer-shell.gyp
- @@ -40,10 +40,10 @@
- ],
- 'conditions': [
- ['v8_enable_i18n_support==1', {
- - 'dependencies': [
- - '<(icu_gyp_path):icui18n',
- - '<(icu_gyp_path):icuuc',
- - ],
- + 'link_settings': { 'libraries': [
- + '-licui18n',
- + '-licuuc'
- + ], },
- }],
- ],
- 'include_dirs+': [
Add Comment
Please, Sign In to add comment