From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 18:46:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C4DC51B6; Thu, 17 Oct 2013 18:46:34 +0000 (UTC) (envelope-from makc@freebsd.org) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 818892964; Thu, 17 Oct 2013 18:46:33 +0000 (UTC) Received: from mercury.ph.man.ac.uk [130.88.75.175:47712] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id r9HIkDiq053738 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Thu, 17 Oct 2013 22:46:14 +0400 (MSK) From: Max Brazhnikov To: Dmitry Marakasov Subject: Re: svn commit: r330501 - head/deskutils/qrfcview Date: Thu, 17 Oct 2013 18:46:14 +0000 Message-ID: <1651195.G2FJH9mVfi@mercury.ph.man.ac.uk> User-Agent: KMail/4.11 (FreeBSD/9.2-STABLE; KDE/4.11.0; amd64; ; ) In-Reply-To: <20131017161416.GA62015@hades.panopticon> References: <201310161249.r9GCnSFP011838@svn.freebsd.org> <6743535.ClJ6S9ZKtj@mercury.ph.man.ac.uk> <20131017161416.GA62015@hades.panopticon> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" 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 18:46:34 -0000 On Thu, 17 Oct 2013 20:14:16 +0400 Dmitry Marakasov wrote: > * 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 ... I suppose your c++ is actually g++ > That's because QMAKEFLAGS contains QMAKE_CC and friends, but > QMAKE_ARGS from Uses/qmake.mk doesn't. it doesn't need to: compiler is already respected via QMAKESPEC, QMAKE_CC, etc are redundant. > 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. > >