From 8793b4d18b48980bb3e9eaaf86b7ee0154cf09b7 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkränzer Date: Fri, 4 Jun 2021 04:07:59 +0200 Subject: Fix meta-intel/meta-clang collisions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-intel assumes LLVM 10 or 11 is being built, and forces a version of SPIRV-LLVM-Translator that doesn't work with LLVM 12. Override this with an LLVM 12 compatible version. Also, meta-intel pulls in intel-mediasdk which, out of the box, doesn't build with compiler-rt. Add a patch to intel-mediasdk that fixes this. Signed-off-by: Bernhard Rosenkränzer Upstream-Status: Pending --- .../clang/llvm-project-source.bbappend | 9 +++++++ .../intel-mediasdk-20.5.1-no-lgcc.patch | 30 ++++++++++++++++++++++ .../mediasdk/intel-mediasdk_%.bbappend | 3 +++ 3 files changed, 42 insertions(+) create mode 100644 recipes-devtools/clang/llvm-project-source.bbappend create mode 100644 recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch create mode 100644 recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend 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 + +Remove -lgcc -- it's unneeded and breaks building with compiler-rt. + +Signed-off-by: Bernhard Rosenkraenzer +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" -- cgit v1.2.3-54-g00ecf