From owner-dev-commits-ports-all@freebsd.org Sun Jul 11 22:31:41 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CC59648233; Sun, 11 Jul 2021 22:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GNM7x05m5z3vJ4; Sun, 11 Jul 2021 22:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB3C323A23; Sun, 11 Jul 2021 22:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16BMVeZu031159; Sun, 11 Jul 2021 22:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16BMVeB2031158; Sun, 11 Jul 2021 22:31:40 GMT (envelope-from git) Date: Sun, 11 Jul 2021 22:31:40 GMT Message-Id: <202107112231.16BMVeB2031158@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 95a1b9aefc62 - main - cad/meshlab: fix build on powerpc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95a1b9aefc62578f50d8c9bb688438b5e60b36e8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2021 22:31:41 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=95a1b9aefc62578f50d8c9bb688438b5e60b36e8 commit 95a1b9aefc62578f50d8c9bb688438b5e60b36e8 Author: Piotr Kubaj AuthorDate: 2021-07-11 22:31:31 +0000 Commit: Piotr Kubaj 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 + +.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