diff options
Diffstat (limited to 'inputmethod/mozc-server/patches/patch-gyp_common.gypi')
| -rw-r--r-- | inputmethod/mozc-server/patches/patch-gyp_common.gypi | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/inputmethod/mozc-server/patches/patch-gyp_common.gypi b/inputmethod/mozc-server/patches/patch-gyp_common.gypi index 3bdf6a80e34..98f8bdd47cd 100644 --- a/inputmethod/mozc-server/patches/patch-gyp_common.gypi +++ b/inputmethod/mozc-server/patches/patch-gyp_common.gypi @@ -1,25 +1,17 @@ -$NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-gyp_common.gypi,v 1.5 2014/06/15 13:08:34 ryoon Exp $ ---- gyp/common.gypi.orig 2014-01-06 07:10:31.000000000 +0000 +--- gyp/common.gypi.orig 2014-05-21 10:51:27.000000000 +0000 +++ gyp/common.gypi -@@ -92,6 +92,7 @@ - '-include base/namespace.h', - '-pipe', - '-pthread', -+ '-std=c++0x', - ], - # linux_cflags will be used in Linux except for NaCl. - 'linux_cflags': [ -@@ -137,7 +138,7 @@ - 'clang_bin_dir': '/Applications/Xcode.app/Contents/Developer/Toolchains' - '/XcodeDefault.xctoolchain/usr/bin/', +@@ -165,7 +165,7 @@ + 'compiler_host': 'gcc', + 'compiler_host_version_int': 406, # GCC 4.6 or higher }], - ['target_platform=="Linux"', { + ['target_platform=="Linux" or target_platform=="NetBSD"', { # enable_gtk_renderer represents if mozc_renderer is supported on Linux # or not. - 'enable_gtk_renderer%': 1, -@@ -195,7 +196,7 @@ + 'compiler_target': 'gcc', +@@ -217,7 +217,7 @@ # server_dir represents the directory where mozc_server is # installed. This option is only for Linux. @@ -28,7 +20,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ # Represents the directory where the source code of protobuf is # extracted. This value is ignored when 'use_libprotobuf' is 1. -@@ -286,7 +287,7 @@ +@@ -311,7 +311,7 @@ ['channel_dev==1', { 'defines': ['CHANNEL_DEV'], }], @@ -37,7 +29,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'ldflags': [ '<@(linux_ldflags)', ], -@@ -451,7 +452,7 @@ +@@ -505,7 +505,7 @@ }, }, 'conditions': [ @@ -46,7 +38,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'cflags': [ '<@(debug_extra_cflags)', ], -@@ -489,7 +490,7 @@ +@@ -552,7 +552,7 @@ }, }, 'conditions': [ @@ -55,7 +47,7 @@ $NetBSD: patch-gyp_common.gypi,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'cflags': [ '<@(release_extra_cflags)', ], -@@ -753,6 +754,22 @@ +@@ -808,6 +808,22 @@ }], ], }], |