3 files changed, 42 insertions, 0 deletions

diff --git a/recipes-devtools/clang/llvm-project-source.bbappend b/recipes-devtools/clang/llvm-project-source.bbappend
new file mode 100644
index 0000000..5d47c23
--- /dev/null
+++ b/recipes-devtools/clang/llvm-project-source.bbappend
@@ -0,0 +1,9 @@
+# This needs to override meta-intel (which pulls in the
+# LLVM 10/11 version of SPIRV-LLVM-Translator)
+
+SPIRV_BRANCH = "llvm_release_120"
+SRC_URI_append_intel-x86-common = " \
+                                    git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=${SPIRV_BRANCH};destsuffix=git/llvm/projects/llvm-spirv;name=spirv \
+                                    "
+SRCREV_spirv = "67d3e271a28287b2c92ecef2f5e98c49134e5946"
+
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch b/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch
new file mode 100644
index 0000000..866dbcd
--- /dev/null
+++ b/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch
@@ -0,0 +1,30 @@
+Author: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+Remove -lgcc -- it's unneeded and breaks building with compiler-rt.
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+diff -up git/builder/FindFunctions.cmake.omv~ git/builder/FindFunctions.cmake
+--- git/builder/FindFunctions.cmake.omv~        2021-06-03 20:35:11.230895070 +0200
++++ git/builder/FindFunctions.cmake     2021-06-03 20:35:49.750360067 +0200
+@@ -200,10 +200,6 @@ function( make_library name variant type
+   set_target_properties( ${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BIN_DIR}/${CMAKE_BUILD_TYPE} FOLDER ${folder} )
+   set_target_properties( ${target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER ${folder} )
+ 
+-  if( Linux )
+-    target_link_libraries( ${target} "-lgcc" )
+-  endif()
+-
+   set( target ${target} PARENT_SCOPE )
+ endfunction()
+ 
+@@ -278,7 +274,7 @@ function( make_executable name variant )
+   endforeach()
+ 
+   if( Linux )
+-    target_link_libraries( ${target} "-Xlinker --end-group -lgcc" )
++    target_link_libraries( ${target} "-Xlinker --end-group" )
+   endif()
+ 
+   set( target ${target} PARENT_SCOPE )
diff --git a/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend b/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend
new file mode 100644
index 0000000..d070d03
--- /dev/null
+++ b/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_toolchain-clang = " file://intel-mediasdk-20.5.1-no-lgcc.patch"