1 files changed, 31 insertions, 20 deletions

diff --git a/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
index 3ef66d4..ab07116 100644
--- a/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
+++ b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
@@ -1,4 +1,4 @@
-From ae81bf58c31d5c93190c3dd85a4100b86055193a Mon Sep 17 00:00:00 2001
+From 400407d9877e4e0408fbf113c6ba7786c341e615 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Wed, 23 Jun 2021 16:25:06 +0800
 Subject: [PATCH] Drop the 'git' suffix from various version variables
@@ -8,18 +8,18 @@ Upstream-Status: Backport [cherry-picked from branch 12.0.0]
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- libcxx/CMakeLists.txt                                           | 2 +-
- libcxxabi/CMakeLists.txt                                        | 2 +-
- libunwind/CMakeLists.txt                                        | 2 +-
- llvm/CMakeLists.txt                                             | 2 +-
- .../llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ libcxx/CMakeLists.txt                                       | 2 +-
+ libcxxabi/CMakeLists.txt                                    | 2 +-
+ libunwind/CMakeLists.txt                                    | 2 +-
+ llvm/CMakeLists.txt                                         | 6 +++---
+ .../llvm/include/llvm/Config/llvm-config.h                  | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
-index 06ee1d74a03e..1ead84c19fcb 100644
+index b1e25358d41a..0048f3284ac2 100644
 --- a/libcxx/CMakeLists.txt
 +++ b/libcxx/CMakeLists.txt
-@@ -29,7 +29,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+@@ -27,7 +27,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
    project(libcxx CXX C)
  
    set(PACKAGE_NAME libcxx)
@@ -29,7 +29,7 @@ index 06ee1d74a03e..1ead84c19fcb 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index 6a9ba8ec635d..dcd7b8765de3 100644
+index 971629d81dbe..a3e25d8e67ca 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
 @@ -28,7 +28,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B
@@ -42,7 +42,7 @@ index 6a9ba8ec635d..dcd7b8765de3 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
-index a2c03fd3f8aa..82424253c8da 100644
+index 81eddbc24879..8b6811ac648e 100644
 --- a/libunwind/CMakeLists.txt
 +++ b/libunwind/CMakeLists.txt
 @@ -24,7 +24,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B
@@ -55,18 +55,29 @@ index a2c03fd3f8aa..82424253c8da 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
-index 5d3ad7a4fd58..796b47a3d554 100644
+index 99773a5ee546..4822fc7edd8f 100644
 --- a/llvm/CMakeLists.txt
 +++ b/llvm/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
-   set(LLVM_VERSION_PATCH 0)
+@@ -795,8 +795,8 @@ if (TENSORFLOW_C_LIB_PATH)
+   include_directories(${TENSORFLOW_C_LIB_PATH}/include)
+   if (NOT TF_PROTO_HEADERS)
+     message(STATUS "TF_PROTO_HEADERS not defined. Looking for tensorflow pip package.")
+-    execute_process(COMMAND 
+-      ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow" 
++    execute_process(COMMAND
++      ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow"
+       OUTPUT_VARIABLE TF_PIP_OUT)
+     if ("${TF_PIP_OUT}" STREQUAL "")
+       message(FATAL ERROR "Tensorflow pip package is also required for 'development' mode (protobuf headers)")
+@@ -828,7 +828,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   include_directories(${TENSORFLOW_AOT_PATH}/include)
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+-  install(TARGETS tf_xla_runtime EXPORT LLVMExports 
++  install(TARGETS tf_xla_runtime EXPORT LLVMExports
+     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
  endif()
- if(NOT DEFINED LLVM_VERSION_SUFFIX)
--  set(LLVM_VERSION_SUFFIX git)
-+  set(LLVM_VERSION_SUFFIX "")
- endif()
- 
- if (NOT PACKAGE_VERSION)
 diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
 index ba85df023ae6..f19c22ad13c0 100644
 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h