[packages/llvm] move compiler-rt part of cmake utils patch to separate file

[atler]

commit 36fac0a6de0c1baff2acf044113a8d83cc298f37
Author: Jan Palus <at...@pld-linux.org>
Date:   Sun Oct 8 10:07:45 2023 +0200

    move compiler-rt part of cmake utils patch to separate file

 cmake-utils-path-override-rt.patch | 11 +++++++++++
 cmake-utils-path-override.patch    | 11 -----------
 llvm.spec                          |  4 +++-
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 6c158c6..0dd90f5 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -117,7 +117,8 @@ Patch8:             %{name}-selective_bindings.patch
 Patch9:                %{name}-libexecdir.patch
 Patch10:       compiler-rt-paths.patch
 Patch11:       cmake-utils-path-override.patch
-Patch12:       x32-compiler-rt.patch
+Patch12:       cmake-utils-path-override-rt.patch
+Patch13:       x32-compiler-rt.patch
 URL:           https://llvm.org/
 BuildRequires: bash
 BuildRequires: binutils-devel
@@ -716,6 +717,7 @@ Integracja narzędzi Clang do formatowania i zmiany nazw z 
Vimem.
 %if %{with rt}
 %patch10 -p1
 %patch12 -p1
+%patch13 -p1
 %endif
 %patch11 -p1
 
diff --git a/cmake-utils-path-override-rt.patch 
b/cmake-utils-path-override-rt.patch
new file mode 100644
index 0000000..9911c8c
--- /dev/null
+++ b/cmake-utils-path-override-rt.patch
@@ -0,0 +1,11 @@
+--- llvm-17.0.2.src/projects/compiler-rt/CMakeLists.txt.orig   2023-10-03 
08:37:35.000000000 +0200
++++ llvm-17.0.2.src/projects/compiler-rt/CMakeLists.txt        2023-10-07 
10:31:48.211026182 +0200
+@@ -5,7 +5,7 @@
+ 
+ cmake_minimum_required(VERSION 3.20.0)
+ 
+-set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
++set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake" CACHE 
STRING "Path to CMake modules shared between projects")
+ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
+   NO_POLICY_SCOPE)
+ 
diff --git a/cmake-utils-path-override.patch b/cmake-utils-path-override.patch
index e339a11..5045dcb 100644
--- a/cmake-utils-path-override.patch
+++ b/cmake-utils-path-override.patch
@@ -9,14 +9,3 @@
  include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
    NO_POLICY_SCOPE)
  
---- llvm-17.0.2.src/projects/compiler-rt/CMakeLists.txt.orig   2023-10-03 
08:37:35.000000000 +0200
-+++ llvm-17.0.2.src/projects/compiler-rt/CMakeLists.txt        2023-10-07 
10:31:48.211026182 +0200
-@@ -5,7 +5,7 @@
- 
- cmake_minimum_required(VERSION 3.20.0)
- 
--set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
-+set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake" CACHE 
STRING "Path to CMake modules shared between projects")
- include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
-   NO_POLICY_SCOPE)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/36fac0a6de0c1baff2acf044113a8d83cc298f37

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit