commit 4cff93c7a81c7f156b82a5293b8a636861de831e
author Yohei Yukawa <yukawa@google.com> Sat Mar 14 07:43:27 2015 +0000
committer Yohei Yukawa <yukawa@google.com> Sat Mar 14 07:43:27 2015 +0000
tree f5f210442dede7ca9ed236afdf59c43891c2e4f5
parent 2e029c2b1beb30638a3332864eae43b6f6036ca8

Use Clang 3.4 to build host binaries

In a recent update of clang-3.5 package in Ubuntu 14.04, /usr/bin/clang was renamed to /usr/bin/clang-3.5 for some reasons.
https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-snapshot/+bug/1420570

As a tentative solution, we will use Clang 3.4 to build host binaries for now.

Note that this CL does not change the toolchanins for the target binaries in Android and NaCl builds.  No user visible change is intended anyway.

Closes 286.

BUG=Issue mozc:286
TEST=unittest

git-svn-id: https://mozc.googlecode.com/svn/trunk@553 a6090854-d499-a067-5803-1114d4e51264

src/docker/ubuntu14.04/Dockerfile

diff --git a/src/docker/ubuntu14.04/Dockerfile b/src/docker/ubuntu14.04/Dockerfile
index e84a5d8..e99c31e 100644
--- a/src/docker/ubuntu14.04/Dockerfile
+++ b/src/docker/ubuntu14.04/Dockerfile
@@ -35,7 +35,7 @@
 RUN dpkg --add-architecture i386
 RUN apt-get update
 ## Common packages for linux build environment
-RUN apt install -y clang-3.5 python pkg-config subversion git curl bzip2 unzip make
+RUN apt install -y clang python pkg-config subversion git curl bzip2 unzip make
 ## Packages for linux desktop version
 RUN apt install -y libibus-1.0-dev libdbus-1-dev libglib2.0-dev subversion libqt4-dev libzinnia-dev tegaki-zinnia-japanese libgtk2.0-dev libxcb-xfixes0-dev
 ## Packages for Android

src/gyp/common.gypi

diff --git a/src/gyp/common.gypi b/src/gyp/common.gypi
index c3bca8a..459ebae 100644
--- a/src/gyp/common.gypi
+++ b/src/gyp/common.gypi
@@ -144,27 +144,27 @@
         'compiler_target': 'clang',
         'compiler_target_version_int': 305,  # Clang 3.5 or higher
         'compiler_host': 'clang',
-        'compiler_host_version_int': 305,  # Clang 3.5 or higher
+        'compiler_host_version_int': 304,  # Clang 3.4 or higher
       }],
       ['target_platform=="Android" and android_compiler=="gcc"', {
         'compiler_target': 'gcc',
         'compiler_target_version_int': 409,  # GCC 4.9 or higher
         'compiler_host': 'clang',
-        'compiler_host_version_int': 305,  # Clang 3.5 or higher
+        'compiler_host_version_int': 304,  # Clang 3.4 or higher
       }],
       ['target_platform=="NaCl"', {
         'compiler_target': 'clang',
         'compiler_target_version_int': 303,  # Clang 3.3 or higher
         'compiler_host': 'clang',
-        'compiler_host_version_int': 305,  # Clang 3.5 or higher
+        'compiler_host_version_int': 304,  # Clang 3.4 or higher
       }],
       ['target_platform=="Linux"', {
         # enable_gtk_renderer represents if mozc_renderer is supported on Linux
         # or not.
         'compiler_target': 'clang',
-        'compiler_target_version_int': 305,  # Clang 3.5 or higher
+        'compiler_target_version_int': 304,  # Clang 3.4 or higher
         'compiler_host': 'clang',
-        'compiler_host_version_int': 305,  # Clang 3.5 or higher
+        'compiler_host_version_int': 304,  # Clang 3.4 or higher
         'enable_gtk_renderer%': 1,
       }, {  # else
         'enable_gtk_renderer%': 0,

src/mozc_version_template.txt

diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 02e901f..7f84cbf 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2069
+BUILD=2070
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.