From 3fbc916a7987f15f874f40f9e5b531eb72bffc7a Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 3 Mar 2021 08:01:54 +0000 Subject: spirv-llvm-translator: disable ccache Native build is failing, error log: ~/build/tmp/work/x86_64-linux/spirv-llvm-translator-native/12.0.0-r0/git/lib/SPIRV/SPIRVLowerSPIRBlocks.cpp | /bin/sh: 1: ccache: not found Signed-off-by: Naveen Saini --- ...0001-cmake-allow-to-enable-disable-ccache.patch | 32 ++++++++++++++++++++++ .../spirv-llvm-translator_git.bb | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch (limited to 'recipes-devtools/spirv-llvm-translator') diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch new file mode 100644 index 0000000..68cdda4 --- /dev/null +++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch @@ -0,0 +1,32 @@ +From 13b679eb76e6877b40fd41b91e71cb172bcf7b26 Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Thu, 4 Mar 2021 11:23:20 +0800 +Subject: [PATCH] cmake: allow to enable/disable ccache + +By default ccache is enabled. + +Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/930] + +Signed-off-by: Naveen Saini +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ddb55c..c7d0498 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,8 +50,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) + + message(STATUS "Found LLVM: ${LLVM_VERSION}") + ++ option(CCACHE_ALLOWED "allow use of ccache" TRUE) + find_program(CCACHE_EXE_FOUND ccache) +- if(CCACHE_EXE_FOUND) ++ if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED) + message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +-- +2.17.1 + diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb index a7b5580..171d54f 100644 --- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb +++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d" BRANCH = "llvm_release_120" SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \ file://0001-Use-12.0.0-for-base-llvm-version.patch \ + file://0001-cmake-allow-to-enable-disable-ccache.patch \ " PV = "12.0.0" @@ -27,6 +28,7 @@ EXTRA_OECMAKE = "\ -DLLVM_EXTERNAL_LIT=lit \ -DLLVM_INCLUDE_TESTS=ON \ -Wno-dev \ + -DCCACHE_ALLOWED=FALSE \ " do_compile_append() { -- cgit v1.2.3-54-g00ecf