From owner-svn-ports-head@freebsd.org Sun Sep 13 10:09:49 2020 Return-Path: Delivered-To: svn-ports-head@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 A3FEC3D3DD1; Sun, 13 Sep 2020 10:09:49 +0000 (UTC) (envelope-from yuri@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 4Bq4ws3sqMz40TR; Sun, 13 Sep 2020 10:09:49 +0000 (UTC) (envelope-from yuri@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 4F09B2417D; Sun, 13 Sep 2020 10:09:49 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08DA9n31026955; Sun, 13 Sep 2020 10:09:49 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08DA9mCl026954; Sun, 13 Sep 2020 10:09:48 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009131009.08DA9mCl026954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 13 Sep 2020 10:09:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548470 - in head/devel/ispc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/devel/ispc: . files X-SVN-Commit-Revision: 548470 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2020 10:09:49 -0000 Author: yuri Date: Sun Sep 13 10:09:48 2020 New Revision: 548470 URL: https://svnweb.freebsd.org/changeset/ports/548470 Log: devel/ispc: Only enable host architecture (no cross-platrorm compilation) PR: 249289 Reported by: VVD Modified: head/devel/ispc/Makefile head/devel/ispc/files/patch-CMakeLists.txt Modified: head/devel/ispc/Makefile ============================================================================== --- head/devel/ispc/Makefile Sun Sep 13 09:36:49 2020 (r548469) +++ head/devel/ispc/Makefile Sun Sep 13 10:09:48 2020 (r548470) @@ -4,7 +4,7 @@ PORTNAME= ispc DISTVERSIONPREFIX= v DISTVERSION= 1.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -17,13 +17,15 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= only available for these architectures BUILD_DEPENDS= m4:devel/m4 -LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} +LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_VERSION} -USES= bison cmake compiler:c++14-lang python:build shebangfix +USES= bison cmake compiler:c++14-lang python:build,test shebangfix USE_GITHUB= yes SHEBANG_FILES= *.py -CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin:${PATH} +LLVM_VERSION= ${LLVM_DEFAULT} + +CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} CMAKE_OFF= ISPC_INCLUDE_EXAMPLES BINARY_ALIAS= python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4 @@ -31,8 +33,11 @@ BINARY_ALIAS= python=${PYTHON_CMD} m4=${LOCALBASE}/bin PLIST_FILES= bin/ispc \ bin/check_isa -do-test: # tests are broken with python-3.6 - @cd ${WRKSRC} && ISPC_HOME=${WRKSRC} ./run_tests.py +do-test: # some tests fail: https://github.com/ispc/ispc/issues/1868 + @cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py + +test-check-all: + @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-all run-examples: build @[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed" Modified: head/devel/ispc/files/patch-CMakeLists.txt ============================================================================== --- head/devel/ispc/files/patch-CMakeLists.txt Sun Sep 13 09:36:49 2020 (r548469) +++ head/devel/ispc/files/patch-CMakeLists.txt Sun Sep 13 10:09:48 2020 (r548470) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-09-13 01:22:29 UTC +--- CMakeLists.txt.orig 2020-08-28 19:43:13 UTC +++ CMakeLists.txt -@@ -45,7 +45,7 @@ set(ISPC_BUILD TRUE) +@@ -45,12 +45,17 @@ set(ISPC_BUILD TRUE) project(${PROJECT_NAME}) set(X86_HOST FALSE) @@ -9,3 +9,14 @@ set(X86_HOST TRUE) endif() ++set(ARM_HOST FALSE) ++if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64") ++ set(ARM_HOST TRUE) ++endif() ++ + option(X86_ENABLED "Enable x86 support" ${X86_HOST}) +-option(ARM_ENABLED "Enable ARM support" ON) ++option(ARM_ENABLED "Enable ARM support" ${ARM_HOST}) + option(WASM_ENABLED "Enable experimental Web Assembly support" OFF) + option(GENX_ENABLED "Enable GenX support" OFF) + option(ISPC_INCLUDE_EXAMPLES "Generate build targets for the ISPC examples" ON)