49 lines
1.7 KiB
Plaintext
49 lines
1.7 KiB
Plaintext
$OpenBSD: patch-build_common_gypi,v 1.4 2011/04/15 10:10:27 robert Exp $
|
|
--- build/common.gypi.orig Wed Apr 13 10:01:33 2011
|
|
+++ build/common.gypi Fri Apr 15 12:08:33 2011
|
|
@@ -92,7 +92,7 @@
|
|
'fastbuild%': 0,
|
|
|
|
# Python version.
|
|
- 'python_ver%': '2.5',
|
|
+ 'python_ver%': '2.6',
|
|
|
|
# Set ARM-v7 compilation flags
|
|
'armv7%': 0,
|
|
@@ -280,7 +280,7 @@
|
|
'linux_strip_reliability_tests%': 0,
|
|
|
|
# Enable TCMalloc.
|
|
- 'linux_use_tcmalloc%': 1,
|
|
+ 'linux_use_tcmalloc%': 0,
|
|
|
|
# Disable TCMalloc's debugallocation.
|
|
'linux_use_debugallocation%': 0,
|
|
@@ -301,7 +301,7 @@
|
|
|
|
# Used to disable Native Client at compile time, for platforms where it
|
|
# isn't supported
|
|
- 'disable_nacl%': 0,
|
|
+ 'disable_nacl%': 1,
|
|
|
|
# Set Thumb compilation flags.
|
|
'arm_thumb%': 0,
|
|
@@ -360,7 +360,7 @@
|
|
# This is used to tweak build flags for gcc 4.4.
|
|
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
|
|
# Figure out the python architecture to decide if we build pyauto.
|
|
- 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)',
|
|
+ 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/local/lib/libpython<(python_ver).so.1.0)',
|
|
'conditions': [
|
|
['branding=="Chrome"', {
|
|
'linux_breakpad%': 1,
|
|
@@ -691,7 +691,7 @@
|
|
['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
|
|
],
|
|
}],
|
|
- ['OS!="linux"', {
|
|
+ ['OS!="linux" and OS!="openbsd"', {
|
|
'sources/': [
|
|
['exclude', '_linux(_unittest)?\\.(h|cc)$'],
|
|
['exclude', '(^|/)linux/'],
|