From 406ec3b31aeb4aac3e134e36acdece40257882bd Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Mon, 28 Nov 2022 06:34:22 -0600
Subject: [PATCH 1/3] Add git as build-time dependency to ensure consistency
 with conda env.

This avoids situations where system git's library dependency are picked
up from conda environment and being inconsistent (may cause GIT to exit
with code 128, internal error).
---
 conda-recipe/meta.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 00dc5f7bc4..e17668fb61 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -16,10 +16,11 @@ requirements:
         - {{ compiler('dpcpp') }}  >=2022.1  # [not osx]
     host:
         - setuptools
-        - cython
         - cmake  >=3.21
-        - python
         - ninja
+        - git
+        - cython
+        - python
         - scikit-build
         - numpy
         - wheel

From e0de6fac564b047e7c47d0600f35da317aee49cb Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Mon, 28 Nov 2022 06:52:00 -0600
Subject: [PATCH 2/3] Only run clean if _skbuild/ exists

---
 conda-recipe/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
index 7b533bee36..951e76366b 100755
--- a/conda-recipe/build.sh
+++ b/conda-recipe/build.sh
@@ -5,7 +5,9 @@
 # activation scripts.
 export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
 
-${PYTHON} setup.py clean --all
+if [ -e "_skbuild" ]; then
+    ${PYTHON} setup.py clean --all
+fi
 export CMAKE_GENERATOR="Ninja"
 SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx"
 echo "${PYTHON} setup.py install ${SKBUILD_ARGS}"

From 701f708363a7a6c12191512205e8af26bc375960 Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Mon, 28 Nov 2022 06:52:10 -0600
Subject: [PATCH 3/3] Fatal error message after execute_process includes return
 code.

---
 libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
index 2929c33298..fe109fc03a 100644
--- a/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
+++ b/libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake
@@ -39,7 +39,7 @@ function(get_level_zero_headers)
 
         if(NOT result EQUAL 0)
             message(FATAL_ERROR
-                "Could not update Level Zero sources."
+                "Could not update Level Zero sources. Return code: ${result}"
             )
         endif()
     else()
@@ -54,7 +54,7 @@ function(get_level_zero_headers)
 
         if(NOT result EQUAL 0)
             message(FATAL_ERROR
-                "Could not clone Level Zero sources from github.com/oneapi-src/level-zero."
+                "Could not clone Level Zero sources from github.com/oneapi-src/level-zero. Return code: ${result}"
             )
         endif()
     endif()
@@ -72,7 +72,7 @@ function(get_level_zero_headers)
 
     if(NOT result EQUAL 0)
         message(FATAL_ERROR
-            "Could not get the name for the latest release."
+            "Could not get the name for the latest release. Return code: ${result}"
         )
     endif()
 
@@ -88,7 +88,7 @@ function(get_level_zero_headers)
 
     if(NOT result EQUAL 0)
         message(FATAL_ERROR
-            "Could not checkout the latest release."
+            "Could not checkout the latest release. Return code: ${result}"
         )
     endif()