Date: Mon, 22 Dec 2014 22:31:01 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375279 - head/net/scribe Message-ID: <201412222231.sBMMV1JQ002661@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Dec 22 22:31:00 2014 New Revision: 375279 URL: https://svnweb.freebsd.org/changeset/ports/375279 QAT: https://qat.redports.org/buildarchive/r375279/ Log: - Fix build with clang [1] - Respect CXXFLAGS during build - Make RUN_DEPENDS path independent PR: 196088 [1] (based on) Submitted by: Real Huang <realhuang21@gmail.com> [1] Modified: head/net/scribe/Makefile Modified: head/net/scribe/Makefile ============================================================================== --- head/net/scribe/Makefile Mon Dec 22 22:17:21 2014 (r375278) +++ head/net/scribe/Makefile Mon Dec 22 22:31:00 2014 (r375279) @@ -20,7 +20,7 @@ LIB_DEPENDS= libboost_system.so:${PORTSD libthrift.so:${PORTSDIR}/devel/thrift-cpp RUN_DEPENDS= p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \ p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \ - ${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift + ${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift GITVERSION= 7359a09 WRKSRC= ${WRKDIR}/facebookarchive-${PORTNAME}-${GITVERSION} @@ -32,10 +32,22 @@ CONFIGURE_ARGS= --with-boost-filesystem= PY_PREFIX="${PREFIX}" USE_AUTOTOOLS= aclocal automake autoconf USE_RC_SUBR= ${PORTNAME} -USES= gmake perl5 python +USES= compiler gmake perl5 python post-patch: - ${REINPLACE_CMD} -e 's/^AM_INIT_AUTOMAKE/#/' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's/^AM_INIT_AUTOMAKE/#/' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e '/boost/! s/shared_ptr/boost::&/g' \ + ${WRKSRC}/src/conf.cpp \ + ${WRKSRC}/src/conn_pool.cpp \ + ${WRKSRC}/src/dynamic_bucket_updater.cpp \ + ${WRKSRC}/src/env_default.cpp \ + ${WRKSRC}/src/file.cpp \ + ${WRKSRC}/src/scribe_server.cpp \ + ${WRKSRC}/src/store.cpp \ + ${WRKSRC}/src/store_queue.cpp + +post-configure: + @${REINPLACE_CMD} 's/-O3/${CXXFLAGS}/' ${WRKSRC}/src/Makefile post-build: ${LOCALBASE}/bin/thrift -o ${WRKSRC} -I ${LOCALBASE}/share --gen "perl" ${WRKSRC}/if/scribe.thrift @@ -48,8 +60,8 @@ post-install: .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -BROKEN= Does not build on FreeBSD 10.0+ +.if ${COMPILER_TYPE} == clang +USE_CXXSTD= c++11 .endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412222231.sBMMV1JQ002661>