[packages/neovim] Rename bcond to prefer_lua, fix for x32

glen glen at pld-linux.org
Fri Nov 6 15:29:25 CET 2020


commit 1b20afad447fdd4c4282b1737cc18196b50ce84b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Nov 6 16:27:23 2020 +0200

    Rename bcond to prefer_lua, fix for x32
    
    luajit not available on x32

 neovim.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/neovim.spec b/neovim.spec
index 66c7b5a..7b24fd3 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -4,7 +4,11 @@
 #   https://github.com/neovim/neovim/issues/5576
 #
 # Conditional build:
-%bcond_without	lua		# Prefer Lua over LuaJit
+%bcond_with	prefer_lua		# Prefer Lua over LuaJit
+
+%ifarch x32
+%define	with_prefer_lua 1
+%endif
 
 Summary:	Vim-fork focused on extensibility and agility
 Name:		neovim
@@ -35,7 +39,7 @@ BuildRequires:	msgpack-devel >= 1.1.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.596
 BuildRequires:	unibilium-devel
-%if %{with lua}
+%if %{with prefer_lua}
 BuildRequires:	lua51
 BuildRequires:	lua51-devel
 %else
@@ -89,6 +93,7 @@ cd .deps
 
 cd ../build
 %cmake \
+	-DPREFER_LUA=%{!?with_prefer_lua:OFF}%{?with_prefer_lua:ON} \
 	-DLUA_PRG=/usr/bin/lua5.1 \
 	-DENABLE_JEMALLOC=ON \
 	-DLUAJIT_USE_BUNDLED=OFF \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/1b20afad447fdd4c4282b1737cc18196b50ce84b



More information about the pld-cvs-commit mailing list