From 254e3a79b3a37045f829848e0a5e04801bec1439 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Fri, 18 Sep 2020 07:54:12 +0800
Subject: Revert "intel-graphics-compiler: improve src package reproducibility"

This reverts commit c6ca760d24dc016434e79a6aceeb608fba890a3c.

This breaks builds using meta-intel master with oe-core dunfell because
the bison option isn't available on older versions.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../improve_src_package_reproducibility.patch      | 31 ----------------------
 .../igc/intel-graphics-compiler_1.0.4756.bb        |  4 ---
 2 files changed, 35 deletions(-)
 delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/improve_src_package_reproducibility.patch

diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/improve_src_package_reproducibility.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/improve_src_package_reproducibility.patch
deleted file mode 100644
index e9e9b439..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/improve_src_package_reproducibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 88b961ce4e2c9744631c51d13fa638e8a8a6c2a9 Mon Sep 17 00:00:00 2001
-From: Lee Chee Yang <chee.yang.lee@intel.com>
-Date: Wed, 2 Sep 2020 08:28:35 +0800
-Subject: [PATCH] Improve Reproducibility for src package
-
-Improve reproducibility for intel-graphics-compiler-src package.
-needs to pass build path as environment variable to the build.
-
-Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream]
-Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
----
- visa/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index 9c169592..ecea91db 100644
---- a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -105,8 +105,8 @@ endif()
- # Set up the bison and flex targets. These commands will set up commands to generate the appropriate
- # source files from the input grammars. It will also set up the dependencies correctly for any
- # library or executable that uses the generated source
--BISON_TARGET(CISAParser CISA.y ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp COMPILE_FLAGS "-vt -p CISA")
--FLEX_TARGET(CISAScanner CISA.l ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp COMPILE_FLAGS "-PCISA ${WIN_FLEX_FLAG}")
-+BISON_TARGET(CISAParser CISA.y ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp COMPILE_FLAGS "-vt -p CISA --file-prefix-map=$ENV{B}=/igc/")
-+FLEX_TARGET(CISAScanner CISA.l ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp COMPILE_FLAGS "-PCISA -L ${WIN_FLEX_FLAG} ")
- ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser)
-
- add_custom_target(CISAScanner_target DEPENDS ${FLEX_CISAScanner_OUTPUTS} ${BISON_CISAParser_OUTPUTS})
---
-2.25.1
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
index 4625ba80..406f9f18 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
@@ -11,16 +11,12 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
 SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
            file://0001-skip-execution-of-ElfPackager.patch \
            file://link-to-LLVMGenXIntrinsics.patch \
-           file://improve_src_package_reproducibility.patch \
           "
 
 SRCREV = "3623209b10b357ddb3a3d6eac3551c53ebc897f7"
 
 S = "${WORKDIR}/git"
 
-# Used to replace with relative path in reproducibility patch
-export B
-
 inherit cmake
 
 COMPATIBLE_HOST = '(x86_64).*-linux'
-- 
cgit v1.2.3-54-g00ecf