diff options
| author | makc <makc@FreeBSD.org> | 2013-11-21 22:15:53 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2013-11-21 22:15:53 +0800 |
| commit | 744ab2fec31de44779e952d8707d8205a72c0a23 (patch) | |
| tree | ddf978dd958836ea71c8d672a52cb0099eb75e64 /Mk/Uses | |
| parent | 56bd65437e6b65de1f344f6540d4b58bd486870f (diff) | |
| download | freebsd-ports-gnome-744ab2fec31de44779e952d8707d8205a72c0a23.tar.gz freebsd-ports-gnome-744ab2fec31de44779e952d8707d8205a72c0a23.tar.zst freebsd-ports-gnome-744ab2fec31de44779e952d8707d8205a72c0a23.zip | |
In preparation for Qt 5 ports:
bsd.qt.mk:
- Deprecate QMAKEFLAGS, QMAKE_ARGS should be used instead
- define LRELEASE/LUPDATE commands for general use
Uses/qmake.mk:
- USES=qmake now implies build dependency on qmake
- Deprecate QMAKE_PRO (QMAKE_SOURCE_PATH should be used if required)
- move QMAKE_ARGS definition to bsd.qt.mk
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/qmake.mk | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index 9f2edf2715f6..19e991d15d5f 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -6,7 +6,7 @@ # # Feature: qmake # Usage: USES=qmake or USES=qmake:ARGS -# Must be used along with 'USE_QT4= qmake_build' +# Must be used along with 'USE_QT4=' # Valid ARGS: norecursive # ARGS description: # norecursive Don't pass -recursive argument to qmake binary @@ -15,13 +15,13 @@ # Variables for ports: # QMAKE_ENV - Environment passed to qmake. # Default: ${CONFIGURE_ENV} -# QMAKE_ARGS - Arguments passed to qmake +# QMAKE_ARGS - Arguments passed to qmake. # Default: see below -# QMAKE_PRO - qmake project file. +# QMAKE_SOURCE_PATH - Path to qmake project files. # Default: empty (autodetect) # # User defined variables: -# QMAKE_VERBOSE - Enable verbose configure output +# QMAKE_VERBOSE - Enable verbose configure output. # .if !defined(_INCLUDE_USES_QMAKE_MK) @@ -39,17 +39,11 @@ IGNORE= Incorrect 'USES+= qmake' usage: argument '${qmake_ARGS}' is not recogniz . endif .endif -.if ${USE_QT4:Mqmake_build} == "" && ${USE_QT4:Mqmake} == "" -IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT4= qmake_build' +.if !defined(USE_QT4) +IGNORE= 'USES+= qmake' must be accompanied with 'USE_QT4= #' .endif -# CC is respected via QMAKESPEC (see Mk/bsd.qt.mk) -QMAKE_ARGS+= -spec ${QMAKESPEC} \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ - PREFIX=${PREFIX} -QMAKE_ENV?= ${CONFIGURE_ENV} +USE_QT4+= qmake_build .if !defined(QMAKE_NORECURSIVE) QMAKE_ARGS+= -recursive @@ -59,9 +53,11 @@ QMAKE_ARGS+= -recursive QMAKE_ARGS+= -d .endif +QMAKE_SOURCE_PATH?= ${QMAKE_PRO} + .if !target(do-configure) do-configure: - @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKE_PRO} + @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} .endif .endif #!defined(_INCLUDE_USES_QMAKE_MK) |