summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorDaichi GOTO <daichi@FreeBSD.org>2010-10-03 09:52:48 +0000
committerDaichi GOTO <daichi@FreeBSD.org>2010-10-03 09:52:48 +0000
commit8296dc8ea4e3f1133b3dd3160c20278bf3126b08 (patch)
tree7b14bcda9e3e2afa5fa4c4ab7b7990c7e7212d60 /japanese
parentUse libtool in c++ mode instead of c mode, to link C++ code. (diff)
Reduce amount of patch, pointed by Google mozc dev team.
Notes
Notes: svn path=/head/; revision=262341
Diffstat (limited to 'japanese')
-rw-r--r--japanese/ibus-mozc/Makefile7
-rw-r--r--japanese/ibus-mozc/files/patch-build_mozc.py20
-rw-r--r--japanese/mozc-server/Makefile7
-rw-r--r--japanese/mozc-server/files/patch-build_mozc.py20
-rw-r--r--japanese/mozc-tool/Makefile7
-rw-r--r--japanese/mozc-tool/files/patch-build_mozc.py20
-rw-r--r--japanese/scim-mozc/Makefile7
-rw-r--r--japanese/scim-mozc/files/patch-build_mozc.py20
8 files changed, 24 insertions, 84 deletions
diff --git a/japanese/ibus-mozc/Makefile b/japanese/ibus-mozc/Makefile
index 857e694fa181..f03436d1e769 100644
--- a/japanese/ibus-mozc/Makefile
+++ b/japanese/ibus-mozc/Makefile
@@ -63,9 +63,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} \
unix/ibus/ibus.gyp:ibus_mozc
do-install:
diff --git a/japanese/ibus-mozc/files/patch-build_mozc.py b/japanese/ibus-mozc/files/patch-build_mozc.py
index 95c9cb262604..0fa4859ff128 100644
--- a/japanese/ibus-mozc/files/patch-build_mozc.py
+++ b/japanese/ibus-mozc/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',
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index efa4bec28f05..e1b95b863375 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -106,9 +106,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}\
server/server.gyp:mozc_server
do-install:
diff --git a/japanese/mozc-server/files/patch-build_mozc.py b/japanese/mozc-server/files/patch-build_mozc.py
index 95c9cb262604..0fa4859ff128 100644
--- a/japanese/mozc-server/files/patch-build_mozc.py
+++ b/japanese/mozc-server/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',
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',
diff --git a/japanese/scim-mozc/Makefile b/japanese/scim-mozc/Makefile
index 19e9f5bbc574..ade610858ab1 100644
--- a/japanese/scim-mozc/Makefile
+++ b/japanese/scim-mozc/Makefile
@@ -62,9 +62,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 Release \
+ ${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} \
unix/scim/scim.gyp:scim_mozc \
unix/scim/scim.gyp:scim_mozc_setup
diff --git a/japanese/scim-mozc/files/patch-build_mozc.py b/japanese/scim-mozc/files/patch-build_mozc.py
index 95c9cb262604..0fa4859ff128 100644
--- a/japanese/scim-mozc/files/patch-build_mozc.py
+++ b/japanese/scim-mozc/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',
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 07:20:21 +0000