Signed-off-by: Naveen Saini <[email protected]> --- .../0001-dont-export-targets-for-binaries.patch | 68 ---------------------- .../clang/files/llvm9-skip-building-tests.patch | 51 ---------------- .../clang/llvm-project-source.bbappend | 28 ++------- 3 files changed, 6 insertions(+), 141 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch delete mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch deleted file mode 100644 index da2475f..0000000 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 559fb8f82295ec4dc64a132b6566939b85c1b6fe Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Thu, 15 Aug 2019 22:34:31 +0800 -Subject: [PATCH] dont export targets for binaries - -The projects using LLVM cmake modules look for target binaries in -sysroot as a result which isn't desirable in this case and isn't needed -either. - -Upstream-Status: Inappropriate [cross-compile specific] - -Signed-off-by: Anuj Mittal <[email protected]> -Signed-off-by: Naveen Saini <[email protected]> ---- - llvm/cmake/modules/AddLLVM.cmake | 9 --------- - llvm/cmake/modules/TableGen.cmake | 6 ------ - 2 files changed, 15 deletions(-) - -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 619e986b8aa..d2bc1a25dd9 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -898,12 +898,6 @@ macro(add_llvm_tool name) - - if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if( LLVM_BUILD_TOOLS ) -- set(export_to_llvmexports) -- if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -- NOT LLVM_DISTRIBUTION_COMPONENTS) -- set(export_to_llvmexports EXPORT LLVMExports) -- set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True) -- endif() - - install(TARGETS ${name} - ${export_to_llvmexports} -@@ -917,9 +911,6 @@ macro(add_llvm_tool name) - endif() - endif() - endif() -- if( LLVM_BUILD_TOOLS ) -- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) -- endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") - endmacro(add_llvm_tool name) - -diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake -index 36c026b5c0f..537acd696d8 100644 ---- a/llvm/cmake/modules/TableGen.cmake -+++ b/llvm/cmake/modules/TableGen.cmake -@@ -148,15 +148,9 @@ macro(add_tablegen target project) - endif() - - if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS) -- set(export_to_llvmexports) -- if(${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -- NOT LLVM_DISTRIBUTION_COMPONENTS) -- set(export_to_llvmexports EXPORT LLVMExports) -- endif() - - install(TARGETS ${target} - ${export_to_llvmexports} - RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}) - endif() -- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target}) - endmacro() --- -2.17.1 - diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch deleted file mode 100644 index 9a7b844..0000000 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 48e50f06b1bbed94cdf5207587161d4bfce7366e Mon Sep 17 00:00:00 2001 -From: Naveen Saini <[email protected]> -Date: Wed, 21 Aug 2019 14:35:31 +0800 -Subject: [PATCH] llvm-spirv: skip building tests - -Some of these need clang to be built and since we're building this in-tree, -that leads to problems when compiling libcxx, compiler-rt which aren't built -in-tree. - -Instead of using SPIRV_SKIP_CLANG_BUILD to skip clang build and adding this to -all components, disable the building of tests altogether. - -Upstream-Status: Inappropriate - -Signed-off-by: Anuj Mittal <[email protected]> -Signed-off-by: Naveen Saini <[email protected]> ---- - CMakeLists.txt | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1208741..20ca3e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,13 +15,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - -- if(LLVM_INCLUDE_TESTS) -- set(LLVM_TEST_COMPONENTS -- llvm-as -- llvm-dis -- ) -- endif(LLVM_INCLUDE_TESTS) -- - find_package(LLVM 9.0.0 REQUIRED - COMPONENTS - Analysis -@@ -56,9 +49,6 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) - - add_subdirectory(lib/SPIRV) - add_subdirectory(tools/llvm-spirv) --if(LLVM_INCLUDE_TESTS) -- add_subdirectory(test) --endif(LLVM_INCLUDE_TESTS) - - install( - FILES --- -2.17.1 - diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend index b4afb32..4c05b65 100644 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend @@ -1,27 +1,11 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" -SPIRV_BRANCH = "${@bb.utils.contains('LLVMVERSION', '9.0.1', 'llvm_release_90', 'llvm_release_100', d)}" - -SPIRV9_SRCREV = "70420631144a6a25613ae37178f2cc1d3607b65b" -SPIRV10_SRCREV = "4d43f68a30a510b4e7607351caab3df8e7426a6b" -SPIRV_SRCREV = "${@bb.utils.contains('LLVMVERSION', '9.0.1', '${SPIRV9_SRCREV}', '${SPIRV10_SRCREV}', d)}" - -LLVM_RECOMMENDED_PATCHES = " file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ - file://IndVarSimplify-Do-not-use-SCEV-expander-for-IVCount-.patch;patchdir=llvm \ - " - -LLVM9_PATCH_LIST = " file://0001-dont-export-targets-for-binaries.patch \ - file://llvm9-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ - ${LLVM_RECOMMENDED_PATCHES} \ - " -LLVM10_PATCH_LIST = " file://llvm10-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ - file://fix-shared-libs.patch;patchdir=llvm/projects/llvm-spirv \ - ${LLVM_RECOMMENDED_PATCHES} \ - " - 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 \ + git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_100;destsuffix=git/llvm/projects/llvm-spirv;name=spirv \ + file://llvm10-skip-building-tests.patch;patchdir=llvm/projects/llvm-spirv \ + file://fix-shared-libs.patch;patchdir=llvm/projects/llvm-spirv \ + file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ + file://IndVarSimplify-Do-not-use-SCEV-expander-for-IVCount-.patch;patchdir=llvm \ " -SRC_URI_append_intel-x86-common = "${@bb.utils.contains('LLVMVERSION', '9.0.1', '${LLVM9_PATCH_LIST}', '${LLVM10_PATCH_LIST}', d)}" -SRCREV_spirv = "${SPIRV_SRCREV}" +SRCREV_spirv = "4d43f68a30a510b4e7607351caab3df8e7426a6b" -- 2.7.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6642): https://lists.yoctoproject.org/g/meta-intel/message/6642 Mute This Topic: https://lists.yoctoproject.org/mt/75699913/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
