Commit 8b498074 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx gold

parent b2c3d2d8
...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d ...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
md5sum = 2ead88646094941dc8de12cdc72ba3b2 md5sum = 2ead88646094941dc8de12cdc72ba3b2
patch-options = -p0 patch-options = -p0
patches = patches =
${:_profile_base_location_}/rewrite-scripts.patch#c88ec09852ce623c317a549751c0ba2f ${:_profile_base_location_}/rewrite-scripts.patch#fbcb935e02b549a0048606be758f33fc
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7 # ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/ # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
...@@ -338,7 +338,42 @@ ...@@ -338,7 +338,42 @@
+git apply ../slapos-v8.patch +git apply ../slapos-v8.patch
--- /dev/null 2017-01-30 09:00:09.914078893 +0100 --- /dev/null 2017-01-30 09:00:09.914078893 +0100
+++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100 +++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,71 @@
+diff --git a/build/standalone.gypi b/build/standalone.gypi
+index f804715..48eea0f 100644
+--- a/build/standalone.gypi
++++ b/build/standalone.gypi
+@@ -132,7 +132,7 @@
+ # Do not use 32-bit gold on 32-bit hosts as it runs out address space
+ # for component=static_library builds.
+ ['(OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or (target_arch=="ia32" and host_arch=="x64"))', {
+- 'linux_use_bundled_gold%': 1,
++ 'linux_use_bundled_gold%': 0,
+ }, {
+ 'linux_use_bundled_gold%': 0,
+ }],
+diff --git a/build/toolchain.gypi b/build/toolchain.gypi
+index c2974c5..a14a704 100644
+--- a/build/toolchain.gypi
++++ b/build/toolchain.gypi
+@@ -109,7 +109,7 @@
+ # Do not use 32-bit gold on 32-bit hosts as it runs out address space
+ # for component=static_library builds.
+ ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
+- 'linux_use_bundled_gold%': 1,
++ 'linux_use_bundled_gold%': 0,
+ }, {
+ 'linux_use_bundled_gold%': 0,
+ }],
+@@ -126,7 +126,7 @@
+ # linux_use_gold_flags: whether to use build flags that rely on gold.
+ # On by default for x64 Linux.
+ ['OS=="linux" and target_arch=="x64"', {
+- 'linux_use_gold_flags%': 1,
++ 'linux_use_gold_flags%': 0,
+ }, {
+ 'linux_use_gold_flags%': 0,
+ }],
+diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc +diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc
+index 053c646..cbd177b 100644 +index 053c646..cbd177b 100644
+--- a/src/compiler/instruction-selector.cc +--- a/src/compiler/instruction-selector.cc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment