From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 16:14:25 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 76E314EB; Thu, 17 Oct 2013 16:14:25 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.114.190]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2FDD02DDB; Thu, 17 Oct 2013 16:14:25 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1VWqDI-0006ho-KV; Thu, 17 Oct 2013 20:14:16 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 329A72A1; Thu, 17 Oct 2013 20:14:16 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 27D5BA3; Thu, 17 Oct 2013 20:14:16 +0400 (MSK) Date: Thu, 17 Oct 2013 20:14:16 +0400 From: Dmitry Marakasov To: Max Brazhnikov Subject: Re: svn commit: r330501 - head/deskutils/qrfcview Message-ID: <20131017161416.GA62015@hades.panopticon> References: <201310161249.r9GCnSFP011838@svn.freebsd.org> <3101750.mf7aS1CQZ3@mercury.ph.man.ac.uk> <20131016222515.GE13756@hades.panopticon> <6743535.ClJ6S9ZKtj@mercury.ph.man.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6743535.ClJ6S9ZKtj@mercury.ph.man.ac.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 16:14:25 -0000 * Max Brazhnikov (makc@freebsd.org) wrote: > On Thu, 17 Oct 2013 02:25:15 +0400 Dmitry Marakasov wrote: > > * Max Brazhnikov (makc@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@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru