Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jul 2021 22:31:40 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 95a1b9aefc62 - main - cad/meshlab: fix build on powerpc
Message-ID:  <202107112231.16BMVeB2031158@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=95a1b9aefc62578f50d8c9bb688438b5e60b36e8

commit 95a1b9aefc62578f50d8c9bb688438b5e60b36e8
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-07-11 22:31:31 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-07-11 22:31:31 +0000

    cad/meshlab: fix build on powerpc
    
    Switch to GCC because of missing libomp for powerpc:
    In file included from /wrkdirs/usr/ports/cad/meshlab/work/meshlab-Meshlab-2020.05/src/common/filterparameter.cpp:28:
    In file included from /usr/local/include/vcglib/vcg/math/matrix44.h:33:
    /usr/local/include/vcglib/eigenlib/Eigen/Core:247:10: fatal error: 'omp.h' file not found
---
 cad/meshlab/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 5a1dafd4ff64..354ff9d60f22 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/include/vcglib/img/img.h:devel/vcglib
 LIB_DEPENDS=	libmpirxx.so:math/mpir
 
-USES=		compiler:c++11-lang dos2unix gl qmake:outsource qt:5
+USES=		dos2unix gl qmake:outsource qt:5
 USE_GL=		gl glu glew
 USE_QT=		buildtools_build core gui network \
 		opengl script xml xmlpatterns widgets
@@ -26,6 +26,14 @@ QMAKE_SOURCE_PATH=	${WRKSRC}/src/meshlab.pro
 
 DOS2UNIX_GLOB=	*.c *.cpp *.h
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc
+USES+=		compiler:gcc-c++11-lib
+.else
+USES+=		compiler:c++11-lang
+.endif
+
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/general.pri
 
@@ -39,4 +47,5 @@ do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/distrib/meshlabserver ${STAGEDIR}${PREFIX}/lib/meshlab
 	${RLN} ${STAGEDIR}${PREFIX}/lib/meshlab/meshlab ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${PREFIX}/lib/meshlab/meshlabserver ${STAGEDIR}${PREFIX}/bin
+
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107112231.16BMVeB2031158>