[packages/llvm] - rel 2, package lua stuff in correct dir

[baggins]

commit 27e6738d14fb8fd8286c00566f81844544388f75
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 19 23:27:41 2026 +0200

    - rel 2, package lua stuff in correct dir

 llvm.spec        |  8 ++++----
 lua-libdir.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index d27939c..d777e68 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -9,8 +9,6 @@
 #	%{_datadir}/clang/clang-include-fixer.el
 #	%{_datadir}/clang/clang-rename.el
 # - system isl in polly?
-# - dependencies and files for lua module
-#	%{_libdir}/lua/5.4/lldb.so
 # - figure out whether we need obj.MLIRCAPIIR files
 # - cmake dependencies mess (LLVMExports.cmake appears to require all -devels):
 #   with llvm-devel and spirv-tools-devel installed but without llvm-mlir (or other packages):
@@ -84,7 +82,7 @@ Summary:	The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):	Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:		llvm
 Version:	22.1.3
-Release:	1
+Release:	2
 License:	Apache 2.0 with LLVM exceptions
 Group:		Development/Languages
 #Source0Download: https://github.com/llvm/llvm-project/releases/
@@ -101,6 +99,7 @@ Patch10:	compiler-rt-paths.patch
 Patch11:	cmake-utils-path-override.patch
 Patch12:	x32-compiler-rt.patch
 Patch14:	compiler-rt-nsan-redefine-builtins.patch
+Patch15:	lua-libdir.patch
 URL:		https://llvm.org/
 BuildRequires:	bash
 BuildRequires:	binutils-devel
@@ -681,6 +680,7 @@ Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 %if %{with rt}
 %patch -P 14 -p1
 %endif
+%patch -P 15 -p1
 
 grep -rl /usr/bin/env clang clang-tools-extra compiler-rt flang lld lldb llvm mlir polly | xargs sed -i -e '1{
 	s,^#!.*bin/env python3\?,#!%{__python3},
@@ -1377,7 +1377,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/lldb-mcp
 %attr(755,root,root) %{_bindir}/lldb-server
 %attr(755,root,root) %{_bindir}/lldb-tblgen
-%attr(755,root,root) %{_prefix}/lib/lua/5.4/lldb.so
+%attr(755,root,root) %{_libdir}/lua/5.4/lldb.so
 %attr(755,root,root) %{_libdir}/liblldb.so.%{version}
 %attr(755,root,root) %ghost %{_libdir}/liblldb.so.22.1
 %attr(755,root,root) %ghost %{_libdir}/liblldbIntelFeatures.so.22.1
diff --git a/lua-libdir.patch b/lua-libdir.patch
new file mode 100644
index 0000000..0f3c4cd
--- /dev/null
+++ b/lua-libdir.patch
@@ -0,0 +1,11 @@
+--- llvm-project-22.1.3.src/lldb/CMakeLists.txt~	2026-04-07 00:57:04.000000000 +0200
++++ llvm-project-22.1.3.src/lldb/CMakeLists.txt	2026-04-19 18:56:57.310004576 +0200
+@@ -101,7 +101,7 @@
+ endif ()
+ 
+ if (LLDB_ENABLE_LUA)
+-  set(LLDB_LUA_DEFAULT_RELATIVE_PATH "lib/lua/${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
++  set(LLDB_LUA_DEFAULT_RELATIVE_PATH "lib${LLVM_LIBDIR_SUFFIX}/lua/${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
+   set(LLDB_LUA_RELATIVE_PATH ${LLDB_LUA_DEFAULT_RELATIVE_PATH}
+     CACHE STRING "Path where Lua modules are installed, relative to install prefix")
+ endif ()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/27e6738d14fb8fd8286c00566f81844544388f75