diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-02-06 22:39:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-02-06 22:39:12 +0000 |
| commit | e9c7d5d9940454357503464654b6616f8e3a5aa7 (patch) | |
| tree | face8015a45e641b391635386293ca0d81876b39 /lang | |
| parent | 3b51d2ebd48905c825b772bc043c59f35428fb00 (diff) | |
| download | ports-e9c7d5d9940454357503464654b6616f8e3a5aa7.tar.gz ports-e9c7d5d9940454357503464654b6616f8e3a5aa7.zip | |
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
MFH: 2018Q1
Notes
Notes:
svn path=/head/; revision=461114
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/beignet/Makefile | 5 | ||||
| -rw-r--r-- | lang/beignet/files/patch-CMake_FindLLVM.cmake | 28 |
2 files changed, 4 insertions, 29 deletions
diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile index 5913ca16b8aa..5d33a3a4e2bc 100644 --- a/lang/beignet/Makefile +++ b/lang/beignet/Makefile @@ -31,7 +31,10 @@ SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh 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 diff --git a/lang/beignet/files/patch-CMake_FindLLVM.cmake b/lang/beignet/files/patch-CMake_FindLLVM.cmake index 5c16c60847b7..28011da08cfc 100644 --- a/lang/beignet/files/patch-CMake_FindLLVM.cmake +++ b/lang/beignet/files/patch-CMake_FindLLVM.cmake @@ -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 ) |