diff --git a/buildenv b/buildenv index 7bcbe3d..8b1681e 100644 --- a/buildenv +++ b/buildenv @@ -1,5 +1,5 @@ # bump: lua-version /LUA_VERSION="(.*)"/ https://www.lua.org/ftp/|re:/lua-([\d.]+).tar.gz/$1/|semver:* -LUA_VERSION="5.1.5" +LUA_VERSION="5.4.7" export ZOPEN_BUILD_LINE="STABLE" # 5.1.5 is needed for Neovim @@ -26,7 +26,7 @@ zopen_check_results() pfx="$2" chk="$1/$2_check.log" - grep -q "Hello world, from Lua 5.1!" $chk + grep -q "Lua 5.4.7" $chk failures=$? echo "actualFailures:$failures" echo "totalTests:1" diff --git a/patches/Makefile.patch b/patches/Makefile.patch index ade93d5..0d55712 100644 --- a/patches/Makefile.patch +++ b/patches/Makefile.patch @@ -1,45 +1,13 @@ diff --git a/Makefile b/Makefile -index 209a132..567bca9 100644 +index 72ca8ff..1f801e2 100644 --- a/Makefile +++ b/Makefile -@@ -38,7 +38,7 @@ RANLIB= ranlib - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= +@@ -36,7 +36,7 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= # Convenience platforms targets. --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris zos +-PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris ++PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris zos # What to install. TO_BIN= lua luac -diff --git a/src/Makefile b/src/Makefile -index e0d4c9f..6f5761c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -10,7 +10,7 @@ PLAT= none - CC= gcc - CFLAGS= -O2 -Wall $(MYCFLAGS) - AR= ar rcu --RANLIB= ranlib -+RANLIB= echo - RM= rm -f - LIBS= -lm $(MYLIBS) - -@@ -20,7 +20,7 @@ MYLIBS= - - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris zos - - LUA_A= liblua.a - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ -@@ -95,6 +95,9 @@ freebsd: - generic: - $(MAKE) all MYCFLAGS= - -+zos: -+ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" -+ - linux: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" - diff --git a/patches/src/Makefile.patch b/patches/src/Makefile.patch new file mode 100644 index 0000000..f7052d3 --- /dev/null +++ b/patches/src/Makefile.patch @@ -0,0 +1,32 @@ +diff --git a/src/Makefile b/src/Makefile +index b771196..2f41a5a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -12,7 +12,7 @@ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + + AR= ar rcu +-RANLIB= ranlib ++RANLIB= echo + RM= rm -f + UNAME= uname + +@@ -30,7 +30,7 @@ CMCFLAGS= + + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +-PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris ++PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris zos + + LUA_A= liblua.a + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o +@@ -143,6 +143,9 @@ posix: + SunOS solaris: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl" + ++zos: ++ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" ++ + # Targets that do not create files (not all makes understand .PHONY). + .PHONY: all $(PLATS) help test clean default o a depend echo +