[Midnightbsd-cvs] mports [20169] trunk/Mk/extensions/qmake.mk: qmake 5

[laffer1 at midnightbsd.org]

Revision: 20169
          http://svnweb.midnightbsd.org/mports/?rev=20169
Author:   laffer1
Date:     2015-09-06 11:01:21 -0400 (Sun, 06 Sep 2015)
Log Message:
-----------
qmake 5

Modified Paths:
--------------
    trunk/Mk/extensions/qmake.mk

Modified: trunk/Mk/extensions/qmake.mk
===================================================================
--- trunk/Mk/extensions/qmake.mk	2015-09-06 14:56:10 UTC (rev 20168)
+++ trunk/Mk/extensions/qmake.mk	2015-09-06 15:01:21 UTC (rev 20169)
@@ -50,6 +50,19 @@
 USE_QT${_QT_VERSION:R:R}+=	qmake_build
 .endif
 
+.if ${_QT_VERSION:M5*}
+# We deliberately do not pass -I${LOCALBASE}/include and -L${LOCALBASE}/lib
+# in the BSD mkspecs because in Qt5 they are always added before the
+# paths in ${WRKSRC}. In other words, if one is upgrading an existing
+# installation the old headers and libraries will always be picked up.
+# Those directories to be passed though, they just need to be passed last.
+# See QTBUG-40825 for more information.
+CONFIGURE_ENV+=	CPATH=${LOCALBASE}/include \
+		LIBRARY_PATH=${LOCALBASE}/lib
+MAKE_ENV+=	CPATH=${LOCALBASE}/include \
+		LIBRARY_PATH=${LOCALBASE}/lib
+.endif  # ${_QT_VERSION:M5*}
+
 # QMAKESPEC belongs to bsd.qt.mk.
 QMAKE_ENV?=	${CONFIGURE_ENV}
 QMAKE_ARGS+=	-spec ${QMAKESPEC} \