Date: Wed, 28 Aug 2019 19:23:10 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510093 - head/graphics/caffe Message-ID: <201908281923.x7SJNAIk034232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Wed Aug 28 19:23:10 2019 New Revision: 510093 URL: https://svnweb.freebsd.org/changeset/ports/510093 Log: graphics/caffe: Respect CXX Don't use clang, unconditionally, respect CXX to fix build on GCC architectures. PR: 238884 Approved by: eric@camachat.org (maintainer timeout), linimon (mentor) Differential Revision: https://reviews.freebsd.org/D21396 Modified: head/graphics/caffe/Makefile Modified: head/graphics/caffe/Makefile ============================================================================== --- head/graphics/caffe/Makefile Wed Aug 28 19:21:12 2019 (r510092) +++ head/graphics/caffe/Makefile Wed Aug 28 19:23:10 2019 (r510093) @@ -54,12 +54,20 @@ PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} DATA GH_ACCOUNT= BVLC USE_GITHUB= yes +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == clang +TRUE_CXX= clang++ +.else +TRUE_CXX= g++${GCC_DEFAULT} +.endif + post-extract: @${CP} -v ${.CURDIR}/files/Makefile.config ${WRKSRC}/ post-patch: @${REINPLACE_CMD} \ - -e "s|%%CXX%%|clang++|g" \ + -e "s|%%CXX%%|${TRUE_CXX}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ @@ -75,4 +83,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/* ${STAGEDIR}/${PREFIX}/lib/*.so.* \ ${STAGEDIR}/${PYTHON_SITELIBDIR}/${PORTNAME}/*.so -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908281923.x7SJNAIk034232>