intel-graphics-compiler: fix buildpaths warnings

Clone SPIRV-Tools and Headers in S instead of WORKDIR so they don't
escape file-prefix-map substitutions.

Fixes buildpaths warnings:

| WARNING: intel-graphics-compiler-1.0.12812.9-r0 do_package_qa: QA Issue: File /usr/lib/.debug/libigc.so.1.0.1 in package intel-graphics-compiler-dbg contains reference to TMPDIR [buildpaths]

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2023-01-09 12:07:30 +08:00
parent 8e1699b60c
commit de84b34a95
2 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,33 @@
From 776692307258f273d54b81c00701a0ad01c9f4e4 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 9 Jan 2023 11:43:05 +0800
Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers
We clone the SPIRV headers and tools in a different directory to ensure
file path substitutions take place.
Upstream-Status: Inappropriate
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
external/SPIRV-Tools/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
index 076079f7c..3b2059f88 100644
--- a/external/SPIRV-Tools/CMakeLists.txt
+++ b/external/SPIRV-Tools/CMakeLists.txt
@@ -42,8 +42,8 @@ else() #By default use build from sources
message(STATUS "[SPIRV-Tools] : Building from source")
message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
- set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
- set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Tools")
+ set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Headers") # used in subdirectory
+ set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Tools")
set(SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR}/external/SPIRV-Tools/build")
set(IGC_BUILD__SPIRV-Headers_DIR "${SPIRV-Headers_SOURCE_DIR}")
--
2.37.3

View File

@ -10,14 +10,15 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.12812 \
git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=master \
file://0003-Improve-Reproducibility-for-src-package.patch \
file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
file://c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch \
file://d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch \
file://e09e752949e7af0231884d1b11ea907e3e8b1611.patch \
file://fix-build-with-llvm12.patch \
file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
"
SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"