commit 01f5250e199bb2125e0be14ed1f41a7c6c404f50
Author: Jan Palus <at...@pld-linux.org>
Date: Sun May 19 14:20:00 2024 +0200
use luajit-lpeg when building with luajit
neovim.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/neovim.spec b/neovim.spec
index 0ffd6ad..9a272b4 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -9,9 +9,11 @@
%endif
%if %{with prefer_lua}
+%define lpeg_library /usr/%{_lib}/lua/5.1/lpeg.so
%define luv_includedir /usr/include/lua5.1
%define luv_library /usr/%{_lib}/lua/5.1/luv.so
%else
+%define lpeg_library /usr/%{_lib}/luajit/2.1/lpeg.so
%define luv_includedir /usr/include/luajit-2.1
%define luv_library /usr/%{_lib}/luajit/2.1/luv.so
%endif
@@ -37,7 +39,6 @@ BuildRequires: libstdc++-devel
BuildRequires: libuv-devel >= 1.28.0
BuildRequires: libvterm-devel >= 0.3.3
BuildRequires: lua-bitop >= 1.0.2
-BuildRequires: lua-lpeg
BuildRequires: lua-mpack >= 1.0.2
BuildRequires: msgpack-devel >= 1.1.0
BuildRequires: pkgconfig
@@ -46,12 +47,14 @@ BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: tree-sitter-devel >= 0.20.9
BuildRequires: unibilium-devel >= 2.0.0
%if %{with prefer_lua}
+BuildRequires: lua-lpeg
BuildRequires: lua51
BuildRequires: lua51-devel
BuildRequires: lua51-luv-devel >= 1.43.0
%else
BuildRequires: luajit
BuildRequires: luajit-devel
+BuildRequires: luajit-lpeg
BuildRequires: luajit-luv-devel >= 1.43.0
%endif
Requires: libuv >= 1.28.0
@@ -105,6 +108,7 @@ Desktop files for Neovim.
-DLUA_INCLUDE_DIR=/usr/include/lua5.1 \
-DUSE_BUNDLED=OFF \
-DENABLE_JEMALLOC=ON \
+ -DLPEG_LIBRARY=%{lpeg_library} \
-DLUV_INCLUDE_DIR=%{luv_includedir} \
-DLUV_LIBRARY=%{luv_library}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/b875481047a6c90331daffc913d1a42c435e012c
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
