Date: Sat, 31 Mar 2018 07:44:40 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r466027 - in branches/2018Q1/lang/beignet: . files Message-ID: <201803310744.w2V7ieBX093121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Mar 31 07:44:40 2018 New Revision: 466027 URL: https://svnweb.freebsd.org/changeset/ports/466027 Log: MFH: r461114 lang/beignet: always bypass LLVM tools autodetection $ MESA_LLVM_VER=-devel make all DISABLE_MAKE_JOBS= [...] -- LLVM llvm-config found at: /usr/local/bin/llvm-config-devel -- find unstable LLVM version 7.0.0svn [...] [1/269] cd /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl && mkdir -p /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl//usr/local/lib/beignet// && LLVM_AS_EXECUTABLE-NOTFOUND -o /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl//usr/local/lib/beignet//ocl_barrier.bc /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl/src/ocl_barrier.ll FAILED: backend/src/libocl/usr/local/lib/beignet/ocl_barrier.bc cd /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl && mkdir -p /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl//usr/local/lib/beignet// && LLVM_AS_EXECUTABLE-NOTFOUND -o /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl//usr/local/lib/beignet//ocl_barrier.bc /wrkdirs/usr/ports/lang/beignet/work/Beignet-1.3.2-Source/backend/src/libocl/src/ocl_barrier.ll /bin/sh: LLVM_AS_EXECUTABLE-NOTFOUND: not found ninja: build stopped: subcommand failed. *** Error code 1 Approved by: ports-secteam (feld) Modified: branches/2018Q1/lang/beignet/Makefile branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/lang/beignet/Makefile ============================================================================== --- branches/2018Q1/lang/beignet/Makefile Sat Mar 31 07:42:58 2018 (r466026) +++ branches/2018Q1/lang/beignet/Makefile Sat Mar 31 07:44:40 2018 (r466027) @@ -31,7 +31,10 @@ SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile ALL_TARGET= all LLVMVER= ${MESA_LLVM_VER:U50} -CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER} +CMAKE_ARGS= -DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVMVER} \ + -DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVMVER} \ + -DLLVM_CONFIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-config${LLVMVER} \ + -DLLVM_LINK_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-link${LLVMVER} ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver Modified: branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake ============================================================================== --- branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake Sat Mar 31 07:42:58 2018 (r466026) +++ branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake Sat Mar 31 07:44:40 2018 (r466027) @@ -1,33 +1,5 @@ --- CMake/FindLLVM.cmake.orig 2017-01-20 10:40:51 UTC +++ CMake/FindLLVM.cmake -@@ -46,21 +46,21 @@ endif (LLVM_FIND_VERSION_MAJOR AND LLVM_ - - if (LLVM_INSTALL_DIR) - find_program(CLANG_EXECUTABLE -- NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang -+ NAMES clang${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) - find_program(LLVM_AS_EXECUTABLE -- NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as -+ NAMES llvm-as${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) - find_program(LLVM_LINK_EXECUTABLE -- NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link -+ NAMES llvm-link${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) - else (LLVM_INSTALL_DIR) - find_program(CLANG_EXECUTABLE -- NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) -+ NAMES clang${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) - find_program(LLVM_AS_EXECUTABLE -- NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as) -+ NAMES llvm-as${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as) - find_program(LLVM_LINK_EXECUTABLE -- NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link) -+ NAMES llvm-link${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link) - endif (LLVM_INSTALL_DIR) - - execute_process( @@ -100,6 +100,9 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803310744.w2V7ieBX093121>