svn commit: r510093 - head/graphics/caffe

Piotr Kubaj pkubaj at FreeBSD.org
Wed Aug 28 19:23:10 UTC 2019


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 at 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>


More information about the svn-ports-head mailing list