Date: Mon, 11 Aug 2014 06:45:42 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364589 - head/devel/thrift-cpp Message-ID: <53e86696.223f.4ca98a44@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Aug 11 06:45:42 2014 New Revision: 364589 URL: http://svnweb.freebsd.org/changeset/ports/364589 QAT: https://qat.redports.org/buildarchive/r364589/ Log: devel/thrift-cpp: - Unbreak Makefile when building with QT4 support. USE_QT4 cannot be set after bsd.port.pre.mk and requires inclusion of bsd.port.options.mk (when used with options). However converting to options helpers saves us from additional include. - Replace spaces with tab while here PR: 189127 Reported by: jrh29@alumni.cwru.edu Approved by: maintainer timeout (3 months from the date of report, I didn't wait approval for my patch) MFH: 2014Q3 Modified: head/devel/thrift-cpp/Makefile Modified: head/devel/thrift-cpp/Makefile ============================================================================== --- head/devel/thrift-cpp/Makefile Mon Aug 11 06:36:23 2014 (r364588) +++ head/devel/thrift-cpp/Makefile Mon Aug 11 06:45:42 2014 (r364589) @@ -34,10 +34,11 @@ INSTALL_WRKSRC= ${WRKSRC}/lib/cpp OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 +QT4_USE= QT4=network,moc_build,qmake_build,rcc_build,uic_build OPTIONS_SUB= yes -CONFIGURE_ARGS+= \ +CONFIGURE_ARGS+= \ --without-c_glib \ --with-cpp \ --without-csharp \ @@ -56,10 +57,6 @@ CONFIGURE_ARGS+= \ USE_CXXSTD= c++11 .endif -.if ${PORT_OPTIONS:MQT4} -USE_QT4= network moc_build qmake_build rcc_build uic_build -.endif - post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e86696.223f.4ca98a44>