From 0909177b2d7346ef1823d5c1b41bc7da792fa25f Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Mon, 9 Mar 2020 17:14:15 +0800 Subject: intel-compute-runtime: fix missing header error In order to include visa/ headers from igc, set IGC_DIR path Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../fix-missing-header-path.patch | 49 ---------------------- .../intel-compute-runtime_20.04.15428.bb | 3 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch (limited to 'dynamic-layers') diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch deleted file mode 100644 index dbeeb1d3..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c5cbcef415b16a8d0168c0d6b9da467d8c4e59a3 Mon Sep 17 00:00:00 2001 -From: Naveen Saini -Date: Thu, 6 Feb 2020 16:01:39 +0800 -Subject: [PATCH] linker.cpp: fix for missing RelocationInfo.h - -Facing build failure with below error: - -git/core/compiler_interface/linker.cpp:14:10: fatal error: RelocationInfo.h: No such file or directory -| 14 | #include "RelocationInfo.h" -| | ^~~~~~~~~~~~~~~~~~ -| compilation terminated. - -Upstream-Status: Submitted [https://github.com/intel/compute-runtime/pull/256] - -Signed-off-by: Naveen Saini ---- - core/compiler_interface/linker.cpp | 2 +- - core/unit_tests/compiler_interface/linker_tests.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/compiler_interface/linker.cpp b/core/compiler_interface/linker.cpp -index a5b0386e9..c1445b336 100644 ---- a/core/compiler_interface/linker.cpp -+++ b/core/compiler_interface/linker.cpp -@@ -11,7 +11,7 @@ - #include "core/helpers/debug_helpers.h" - #include "core/helpers/ptr_math.h" - --#include "RelocationInfo.h" -+#include "visa/RelocationInfo.h" - - #include - -diff --git a/core/unit_tests/compiler_interface/linker_tests.cpp b/core/unit_tests/compiler_interface/linker_tests.cpp -index 6bb7e987c..f2d0b5632 100644 ---- a/core/unit_tests/compiler_interface/linker_tests.cpp -+++ b/core/unit_tests/compiler_interface/linker_tests.cpp -@@ -11,7 +11,7 @@ - - #include - --#include "RelocationInfo.h" -+#include "visa/RelocationInfo.h" - - TEST(LinkerInputTests, givenGlobalsSymbolTableThenProperlyDecodesGlobalVariablesAndGlobalConstants) { - NEO::LinkerInput linkerInput; --- -2.17.1 - diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb index a910ab34..f6cfaf19 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb @@ -13,9 +13,7 @@ SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \ SRC_URI_append_class-target = " \ file://dont-use-ld-library-path.patch \ - file://fix-missing-header-path.patch \ " - SRCREV = "98006aa2bf282ebc5914359e0e4c5f1c539de56f" S = "${WORKDIR}/git" @@ -31,6 +29,7 @@ COMPATIBLE_HOST = '(x86_64).*-linux' COMPATIBLE_HOST_libc-musl = "null" EXTRA_OECMAKE = " \ + -DIGC_DIR=${STAGING_INCDIR}/igc \ -DBUILD_TYPE=Release \ -DSKIP_UNIT_TESTS=1 \ -DCCACHE_ALLOWED=FALSE \ -- cgit v1.2.3-54-g00ecf