svn commit: r330501 - head/deskutils/qrfcview

[Dmitry Marakasov]

* Max Brazhnikov (makc at freebsd.org) wrote:

> On Thu, 17 Oct 2013 02:25:15 +0400 Dmitry Marakasov wrote:
> > * Max Brazhnikov (makc at freebsd.org) wrote:
> > 
> > > > Log:
> > > >   - Support staging
> > > >   - Make qmake respect CXX/CXXFLAGS
> > > 
> > > We have USES=qmake now, which has support for all of above.
> > 
> > I know, but I'd like to avoid it until it properly supports compiler and
> > flags settings.
> 
> It does support both, until I miss something. Can you clarify?

Actually, it does respect flags, but not compiler:

% cd /usr/ports/deskutils/qrfcview
% make all clean | grep -- -c | head -1
c++ -c -O2 -pipe -march=nocona ...
% patch << _END
Index: Makefile
===================================================================
--- Makefile	(revision 330501)
+++ Makefile	(working copy)
@@ -14,13 +14,11 @@
 USE_QT4=	gui network corelib qmake_build uic_build moc_build rcc_build
 PLIST_FILES=	bin/qRFCView
 PORTDOCS=	*
+USES=		qmake
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=DOCS
 
-do-configure:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} -unix rfcview.pro
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/qRFCView ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
_END
% make all clean | grep -- -c | head -1
g++ -c -O2 -pipe -march=nocona ...

That's because QMAKEFLAGS contains QMAKE_CC and friends, but
QMAKE_ARGS from Uses/qmake.mk doesn't.

Now I see qmake.mk was committed by you, so please see this patch made
by adding missing bits from QMAKEFLAGS to QMAKE_ARGS:

--- qmake.mk.patch begins here ---
Index: qmake.mk
===================================================================
--- qmake.mk	(revision 329917)
+++ qmake.mk	(working copy)
@@ -45,10 +45,19 @@
 
 # CC is respected via QMAKESPEC (see Mk/bsd.qt.mk)
 QMAKE_ARGS+=	-spec ${QMAKESPEC} \
+		QMAKE_CC="${CC}" \
+		QMAKE_CXX="${CXX}" \
+		QMAKE_LINK="${CXX}" \
+		QMAKE_LINK_SHLIB="${CXX}" \
+		QMAKE_LINK_C="${CC}" \
+		QMAKE_LINK_C_SHLIB="${CC}" \
 		QMAKE_CFLAGS="${CFLAGS}" \
 		QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_CFLAGS_THREAD="${PTHREAD_CFLAGS}" \
+		QMAKE_LFLAGS_THREAD="${PTHREAD_LIBS}" \
 		QMAKE_LFLAGS="${LDFLAGS}" \
 		PREFIX=${PREFIX}
+
 QMAKE_ENV?=	${CONFIGURE_ENV}
 
 .if !defined(QMAKE_NORECURSIVE)
--- qmake.mk.patch ends here ---

It solves qmake.mk shortcomings for me.

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru  ..:  jabber: amdmi3 at jabber.ru    http://www.amdmi3.ru