svn commit: r403081 - head/Mk
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sat Dec 5 21:39:14 UTC 2015
Author: rakuco
Date: Sat Dec 5 21:39:13 2015
New Revision: 403081
URL: https://svnweb.freebsd.org/changeset/ports/403081
Log:
bsd.qt.mk: Move QT_NONSTANDARD check to the _POSTMKINCLUDED section.
Do it so that files in Mk/Uses can set it too. It is required by the
upcoming Uses/pyqt.mk that we will land soon to support PyQt5.
PR: 204975
Modified:
head/Mk/bsd.qt.mk
Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk Sat Dec 5 21:25:33 2015 (r403080)
+++ head/Mk/bsd.qt.mk Sat Dec 5 21:39:13 2015 (r403081)
@@ -208,16 +208,6 @@ PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \
FULLVER=${_QT_VERSION:C/-.*//}
.endif # defined(QT_DIST)
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
- MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
- QMAKESPEC="${QMAKESPEC}"
-CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
- --with-qt-libraries=${QT_LIBDIR} \
- --with-extra-includes=${LOCALBASE}/include \
- --with-extra-libs=${LOCALBASE}/lib
-.endif # !defined(QT_NONSTANDARD)
-
.if ${_QT_VERSION:M4*}
QT_BINDIR_REL?= bin
QT_LIBDIR_REL?= lib/${_QT_RELNAME}
@@ -287,6 +277,16 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DI
Qt_Post_Include= bsd.qt.mk
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
+ MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
+ QMAKESPEC="${QMAKESPEC}"
+CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
+ --with-qt-libraries=${QT_LIBDIR} \
+ --with-extra-includes=${LOCALBASE}/include \
+ --with-extra-libs=${LOCALBASE}/lib
+.endif # !defined(QT_NONSTANDARD)
+
_USE_QT_ALL= assistant clucene dbus declarative designer gui help \
imageformats linguist linguisttools multimedia network opengl pixeltool \
qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \
More information about the svn-ports-head
mailing list