From owner-svn-ports-branches@freebsd.org Sun Nov 29 23:43:14 2020 Return-Path: Delivered-To: svn-ports-branches@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 6933D46843B; Sun, 29 Nov 2020 23:43:14 +0000 (UTC) (envelope-from pkubaj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CklKt2NXKz3pDr; Sun, 29 Nov 2020 23:43:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44A4F1A10D; Sun, 29 Nov 2020 23:43:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ATNhEoO035290; Sun, 29 Nov 2020 23:43:14 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ATNhEcV035289; Sun, 29 Nov 2020 23:43:14 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202011292343.0ATNhEcV035289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 29 Nov 2020 23:43:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r556604 - branches/2020Q4/misc/veles X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q4/misc/veles X-SVN-Commit-Revision: 556604 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2020 23:43:14 -0000 Author: pkubaj Date: Sun Nov 29 23:43:13 2020 New Revision: 556604 URL: https://svnweb.freebsd.org/changeset/ports/556604 Log: MFH: r556603 misc/veles: fix build on GCC architectures Use Clang only on Clang architectures. Approved by: portmgr (fix build blanket) Modified: branches/2020Q4/misc/veles/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/misc/veles/Makefile ============================================================================== --- branches/2020Q4/misc/veles/Makefile Sun Nov 29 23:41:43 2020 (r556603) +++ branches/2020Q4/misc/veles/Makefile Sun Nov 29 23:43:13 2020 (r556604) @@ -22,7 +22,7 @@ BUILD_DEPENDS= msgpack>0:devel/msgpack \ ${PYTHON_DEPENDS} RUN_DEPENDS= ${PYTHON_DEPENDS} -USES= cmake python:3.6+ qt:5 shebangfix +USES= cmake compiler python:3.6+ qt:5 shebangfix SHEBANG_GLOB= *.py SHEBANG_FILES= python/plugin python/proxy resources/install/postinst python/test_dis USE_GITHUB= yes @@ -35,11 +35,18 @@ CMAKE_ARGS= -DFREEBSD_PYTHON_CMD:STRING=${PYTHON_CMD} -DFREEBSD_PYTHON_SITELIBDIR:STRING=${PYTHON_SITELIBDIR} \ -DMSGPACK_INCLUDE_PATH:STRING=${LOCALBASE}/include/mgpack +.include + # veles needs clang-format and clang-tidy that are only provided by the port BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} + +.if ${CHOSEN_COMPILER_TYPE} == clang CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} +.else +USE_GCC= yes +.endif post-patch: @${REINPLACE_CMD} 's|QString python_interpreter_executable("/usr/local/bin/python3");|QString python_interpreter_executable("${PYTHON_CMD}");|' \ @@ -50,4 +57,4 @@ post-install: cd ${WRKSRC}/python/veles && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} ${INSTALL_SCRIPT} ${WRKSRC}/python/srv.py ${STAGEDIR}${PREFIX}/bin/veles-server -.include +.include