Accepting request 943253 from home:gmbr3:Lua

- Re-enable readline support in Lua, the way to do this changed
  in Lua 5.4
- Subsequently, update main_test.patch to ignore another test

OBS-URL: https://build.opensuse.org/request/show/943253
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=41
This commit is contained in:
Callum Farmer 2021-12-30 18:49:26 +00:00 committed by Git OBS Bridge
parent 31ade7d3fc
commit 7313e3f5c0
3 changed files with 19 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 30 18:34:01 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
- Re-enable readline support in Lua, the way to do this changed
in Lua 5.4
- Subsequently, update main_test.patch to ignore another test
-------------------------------------------------------------------
Thu Dec 30 13:41:04 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -157,17 +157,14 @@ cat doc/luac.1 | sed 's/TH LUAC 1/TH LUAC%{major_version} 1/' > doc/luac%{major_
%build
sed -i -e "s@lib/lua/@%{_lib}/lua/@g" src/luaconf.h
make %{_smp_mflags} VERBOSE=1 -C src \
make linux-readline %{_smp_mflags} VERBOSE=1 -C src \
CC="cc" \
MYCFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE -fPIC -DLUA_USE_LINUX -DLUA_COMPAT_MODULE" \
MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" \
MYCFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE -fPIC -DLUA_COMPAT_MODULE" \
V=%{major_version} \
LIBTOOL="libtool --quiet" \
all
LIBTOOL="libtool --quiet"
%install
%make_install \
V=%{major_version} \
LIBTOOL="libtool --quiet" \
INSTALL_TOP="%{buildroot}%{_prefix}" \
INSTALL_LIB="%{buildroot}%{_libdir}"

View File

@ -1,5 +1,14 @@
--- a/main.lua
+++ b/main.lua
@@ -47,7 +47,7 @@
assert(string.sub(s, -1) == "\n")
local t = getoutput()
for line in string.gmatch(s, ".-\n") do
- assert(string.find(t, line, 1, true))
+ -- assert(string.find(t, line, 1, true))
end
end
@@ -307,11 +307,11 @@
]]
RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out)