diff options
| author | Daichi GOTO <daichi@FreeBSD.org> | 2010-10-03 09:52:48 +0000 |
|---|---|---|
| committer | Daichi GOTO <daichi@FreeBSD.org> | 2010-10-03 09:52:48 +0000 |
| commit | 8296dc8ea4e3f1133b3dd3160c20278bf3126b08 (patch) | |
| tree | 7b14bcda9e3e2afa5fa4c4ab7b7990c7e7212d60 /japanese/mozc-tool | |
| parent | e4e480b60ff2ed39b606b27df89e4bcfe91154d2 (diff) | |
Reduce amount of patch, pointed by Google mozc dev team.
Notes
Notes:
svn path=/head/; revision=262341
Diffstat (limited to 'japanese/mozc-tool')
| -rw-r--r-- | japanese/mozc-tool/Makefile | 7 | ||||
| -rw-r--r-- | japanese/mozc-tool/files/patch-build_mozc.py | 20 |
2 files changed, 6 insertions, 21 deletions
diff --git a/japanese/mozc-tool/Makefile b/japanese/mozc-tool/Makefile index f483dc45b76f..e20b01cf421a 100644 --- a/japanese/mozc-tool/Makefile +++ b/japanese/mozc-tool/Makefile @@ -57,9 +57,12 @@ post-patch: do-build: @cd ${WRKSRC}/; \ + export BUILD_COMMAND=${GMAKE}; \ ${PYTHON_CMD} build_mozc.py gyp --gypdir=${LOCALBASE}/bin; \ - ${PYTHON_CMD} build_mozc.py build_tools -c ${BUILD_MODE}; \ - ${PYTHON_CMD} build_mozc.py build -c ${BUILD_MODE} \ + ${PYTHON_CMD} build_mozc.py build_tools \ + -c ${BUILD_MODE} --qtdir=${QT_LIBDIR}; \ + ${PYTHON_CMD} build_mozc.py build \ + -c ${BUILD_MODE} --qtdir=${QT_LIBDIR} \ gui/gui.gyp:mozc_tool do-install: diff --git a/japanese/mozc-tool/files/patch-build_mozc.py b/japanese/mozc-tool/files/patch-build_mozc.py index 95c9cb262604..0fa4859ff128 100644 --- a/japanese/mozc-tool/files/patch-build_mozc.py +++ b/japanese/mozc-tool/files/patch-build_mozc.py @@ -1,5 +1,5 @@ --- build_mozc.py.org 2010-09-25 11:04:25.422333501 +0900 -+++ build_mozc.py 2010-09-25 11:05:53.458336959 +0900 ++++ build_mozc.py 2010-10-03 12:55:53.425314392 +0900 @@ -69,7 +69,7 @@ def IsLinux(): @@ -9,21 +9,3 @@ # TODO(yukawa): Move this function to util.py (b/2715400) -@@ -578,6 +578,8 @@ - - # default Qt dir to support the current build procedure for Debian. - default_qtdir = '/usr/local/Trolltech/Qt-4.6.3' -+ if os.uname()[0] == 'FreeBSD': -+ default_qtdir = '@@LOCALBASE@@/lib/qt4' - if IsWindows(): - default_qtdir = None - parser.add_option('--qtdir', dest='qtdir', -@@ -629,6 +631,8 @@ - target_names.append(target_name) - - make_command = os.getenv('BUILD_COMMAND', 'make') -+ if os.uname()[0] == 'FreeBSD': -+ make_command = os.getenv('BUILD_COMMAND', 'gmake') - # flags for building in Chrome OS chroot environment - envvars = [ - 'CFLAGS', |