File chromium-6.0.406.0-system-gyp-v8.patch of Package chromium-square
--- chromium/src/build/all.gyp 2010-11-25 19:17:16.000000000 +0100
+++ new/src/build/all.gyp 2010-11-25 21:05:09.413000018 +0100
@@ -59,7 +59,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '../v8/tools/gyp/v8.gyp:*',
+ 'linux/system.gyp:v8',
],
}],
['OS=="mac" or OS=="linux"', {
@@ -149,167 +149,6 @@
}],
],
}, # target_name: All
- {
- 'target_name': 'chromium_builder_tests',
- 'type': 'none',
- 'dependencies': [
- '../base/base.gyp:base_unittests',
- '../chrome/chrome.gyp:browser_tests',
- '../chrome/chrome.gyp:interactive_ui_tests',
- '../chrome/chrome.gyp:nacl_ui_tests',
- '../chrome/chrome.gyp:nacl_sandbox_tests',
- '../chrome/chrome.gyp:safe_browsing_tests',
- '../chrome/chrome.gyp:sync_integration_tests',
- '../chrome/chrome.gyp:sync_unit_tests',
- '../chrome/chrome.gyp:ui_tests',
- '../chrome/chrome.gyp:unit_tests',
- '../content/content.gyp:content_unittests',
- '../crypto/crypto.gyp:crypto_unittests',
- '../ui/ui.gyp:gfx_unittests',
- '../gpu/gpu.gyp:gpu_unittests',
- '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
- '../ipc/ipc.gyp:ipc_tests',
- '../jingle/jingle.gyp:jingle_unittests',
- '../media/media.gyp:media_unittests',
- '../net/net.gyp:net_unittests',
- '../printing/printing.gyp:printing_unittests',
- '../remoting/remoting.gyp:remoting_unittests',
- '../sql/sql.gyp:sql_unittests',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- 'temp_gyp/googleurl.gyp:googleurl_unittests',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- '../chrome/chrome.gyp:installer_util_unittests',
- '../chrome/chrome.gyp:mini_installer_test',
- # mini_installer_tests depends on mini_installer. This should be
- # defined in installer.gyp.
- '../chrome/installer/mini_installer.gyp:mini_installer',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
- '../chrome_frame/chrome_frame.gyp:npchrome_frame',
- '../courgette/courgette.gyp:courgette_unittests',
- '../sandbox/sandbox.gyp:sbox_integration_tests',
- '../sandbox/sandbox.gyp:sbox_unittests',
- '../sandbox/sandbox.gyp:sbox_validation_tests',
- '../views/views.gyp:views_unittests',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
- # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
- # This should:
- # 1) not be the case. OR.
- # 2) be expressed in the ui tests dependencies.
- '../webkit/webkit.gyp:test_shell_common',
- ],
- }],
- ],
- }, # target_name: chromium_builder_tests
- {
- 'target_name': 'chromium_2010_builder_tests',
- 'type': 'none',
- 'dependencies': [
- '../chrome/chrome.gyp:chrome',
- '../base/base.gyp:base_unittests',
- '../chrome/chrome.gyp:browser_tests',
- '../chrome/chrome.gyp:interactive_ui_tests',
- # TODO(bradnelson): fix and enable.
- #'../chrome/chrome.gyp:nacl_ui_tests',
- #'../chrome/chrome.gyp:nacl_sandbox_tests',
- '../chrome/chrome.gyp:safe_browsing_tests',
- '../chrome/chrome.gyp:sync_integration_tests',
- '../chrome/chrome.gyp:sync_unit_tests',
- '../chrome/chrome.gyp:ui_tests',
- '../chrome/chrome.gyp:unit_tests',
- '../content/content.gyp:content_unittests',
- '../crypto/crypto.gyp:crypto_unittests',
- '../ui/ui.gyp:gfx_unittests',
- '../gpu/gpu.gyp:gpu_unittests',
- '../ipc/ipc.gyp:ipc_tests',
- '../jingle/jingle.gyp:jingle_unittests',
- '../media/media.gyp:media_unittests',
- '../net/net.gyp:net_unittests',
- '../printing/printing.gyp:printing_unittests',
- '../remoting/remoting.gyp:remoting_unittests',
- '../sql/sql.gyp:sql_unittests',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- 'temp_gyp/googleurl.gyp:googleurl_unittests',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- '../chrome/chrome.gyp:installer_util_unittests',
- # TODO(bradnelson): fix and enable.
- #'../chrome/chrome.gyp:mini_installer_test',
- # mini_installer_tests depends on mini_installer. This should be
- # defined in installer.gyp.
- #'../chrome/installer/mini_installer.gyp:mini_installer',
- #'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- #'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- #'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- #'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- #'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
- #'../chrome_frame/chrome_frame.gyp:npchrome_frame',
- '../courgette/courgette.gyp:courgette_unittests',
- '../sandbox/sandbox.gyp:sbox_integration_tests',
- '../sandbox/sandbox.gyp:sbox_unittests',
- '../sandbox/sandbox.gyp:sbox_validation_tests',
- '../views/views.gyp:views_unittests',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
- # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
- # This should:
- # 1) not be the case. OR.
- # 2) be expressed in the ui tests dependencies.
- '../webkit/webkit.gyp:test_shell_common',
- ],
- }],
- ],
- }, # target_name: chromium_2010_builder_tests
- {
- 'target_name': 'chromium_builder_nacl_win_integration',
- 'type': 'none',
- 'dependencies': [
- 'chromium_builder_qa', # needed for pyauto
- 'chromium_builder_tests',
- ],
- }, # target_name: chromium_builder_nacl_win_integration
- {
- 'target_name': 'chromium_builder_perf',
- 'type': 'none',
- 'dependencies': [
- 'chromium_builder_qa', # needed for pyauto
- '../chrome/chrome.gyp:performance_ui_tests',
- '../chrome/chrome.gyp:plugin_tests',
- '../chrome/chrome.gyp:sync_performance_tests',
- '../chrome/chrome.gyp:ui_tests',
- ],
- }, # target_name: chromium_builder_perf
- {
- 'target_name': 'chromium_gpu_builder',
- 'type': 'none',
- 'dependencies': [
- '../chrome/chrome.gyp:gpu_tests',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:DumpRenderTree',
- ],
- }, # target_name: chromium_gpu_builder
- {
- 'target_name': 'chromium_builder_qa',
- 'type': 'none',
- 'dependencies': [
- '../chrome/chrome.gyp:chromedriver',
- ],
- 'conditions': [
- ['OS=="mac" or OS=="win" or (os_posix==1 and target_arch==python_arch)', {
- 'dependencies': [
- '../chrome/chrome.gyp:pyautolib',
- ],
- }],
- ],
- }, # target_name: chromium_builder_qa
],
'conditions': [
['OS=="mac"', {
--- chromium/src/build/linux/system.gyp 2010-11-20 23:07:46.000000000 +0100
+++ new/src/build/linux/system.gyp 2010-11-25 21:05:09.418000018 +0100
@@ -340,6 +340,19 @@
}]]
},
{
+ 'target_name': 'v8',
+ 'type': 'settings',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lv8',
+ '-lvpx',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'settings',
'conditions': [
--- chromium/src/net/net.gyp 2010-11-25 19:17:15.000000000 +0100
+++ new/src/net/net.gyp 2010-11-25 21:05:09.427000018 +0100
@@ -717,7 +717,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '../v8/tools/gyp/v8.gyp:v8',
+ '../build/linux/system.gyp:v8',
],
}],
['chromeos==1', {
--- chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-20 23:09:21.000000000 +0100
+++ new/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp 2010-11-25 21:05:09.435000018 +0100
@@ -789,7 +789,7 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
@@ -904,10 +904,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'export_dependent_settings': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'conditions': [
['inside_chromium_build==1 and OS=="win" and component=="shared_library"', {
@@ -1438,10 +1438,10 @@
'conditions': [
['javascript_engine=="v8"', {
'dependencies': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
'export_dependent_settings': [
- '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
+ '<(chromium_src_dir)/build/linux/system.gyp:v8',
],
}],
['OS=="mac"', {
