From a84d8a498c0fcca55aec642136efc8a0fe2a5dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 22 Nov 2022 17:47:59 +0100 Subject: [PATCH] Fix build without luajit (on another archs). --- neovim.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neovim.spec b/neovim.spec index c8d93e2..0708985 100644 --- a/neovim.spec +++ b/neovim.spec @@ -42,7 +42,7 @@ Requires: python3-neovim %bcond_with luajit %endif Name: neovim -Version: 0.8.0+git.1668161918.0d7cc5ee8 +Version: 0.8.0+git.1669111344.cd386b2c7 Release: 0 Summary: Vim-fork focused on extensibility and agility License: Apache-2.0 AND Vim @@ -102,6 +102,7 @@ BuildRequires: lua51-mpack %if %{with luajit} BuildRequires: luajit-devel %else +BuildRequires: lua51-BitOp BuildRequires: lua51-devel %endif Requires: lua51-bit32 @@ -176,7 +177,9 @@ export CXXFLAGS="%{optflags} -fcommon" %{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \ +%if %{with luajit} -DBUSTED_PRG="$(readlink -f ../lj-busted.sh)" \ +%endif -DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=ON \ -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_COLOR_MAKEFILE=OFF \ @@ -222,6 +225,7 @@ mkdir -p %{buildroot}%{vimplugin_dir}/{after,after/syntax,autoload,colors,doc,ft export NO_BRP_CHECK_RPATH=true %check +%if %{with luajit} # Tests fail on aarch64 gh#neovim/neovim#18176 %ifnarch aarch64 # set vars to make build reproducible in spite of config/CMakeLists.txt @@ -231,6 +235,7 @@ pushd build %make_build BUSTED_PRG=$(readlink -f ../lj-busted.sh) unittest popd %endif +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1330 %post