diff --git a/programming/language/lua/actions.py b/programming/language/lua/actions.py index c85712c1f3..42f82bf96b 100644 --- a/programming/language/lua/actions.py +++ b/programming/language/lua/actions.py @@ -24,7 +24,7 @@ def build(): def install(): autotools.rawInstall("INSTALL_TOP=%s/usr INSTALL_MAN=%s/usr/share/man/ INSTALL_LIB=%s/usr/lib/ TO_LIB='liblua.so liblua.so.%s liblua.so.%s'" % (get.installDIR(), get.installDIR(), get.installDIR(), major, get.srcVERSION())) - pisitools.dosym("/usr/lib/liblua.so.5.4.4", "/usr/lib/liblua.so.5.3") + pisitools.dosym("/usr/lib/liblua.so.5.4.7", "/usr/lib/liblua.so.5.3") #pisitools.insinto("/usr/lib", "src/liblua.so*") diff --git a/programming/language/lua/files/liblua.so.patch b/programming/language/lua/files/liblua.so.patch index d7413ae36b..7e956fbfd5 100644 --- a/programming/language/lua/files/liblua.so.patch +++ b/programming/language/lua/files/liblua.so.patch @@ -21,40 +21,40 @@ diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile +++ lua-5.4.0/Makefile 2020-06-30 13:22:00.997938585 -0500 @@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) - + $(PLATS) help test clean: - @cd src && $(MAKE) $@ + @cd src && $(MAKE) $@ V=$(V) R=$(R) - + install: dummy cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h --- lua-5.4.0.orig/src/luaconf.h 2020-06-18 09:25:54.000000000 -0500 +++ lua-5.4.0/src/luaconf.h 2020-06-30 13:24:59.294932289 -0500 @@ -227,7 +227,7 @@ - + #else /* }{ */ - + -#define LUA_ROOT "/usr/local/" +#define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - + diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile --- lua-5.4.0.orig/src/Makefile 2020-04-15 08:00:29.000000000 -0500 +++ lua-5.4.0/src/Makefile 2020-06-30 13:24:15.746933827 -0500 @@ -7,7 +7,7 @@ PLAT= guess - + CC= gcc -std=gnu99 -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) +CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LIBS= -lm $(SYSLIBS) $(MYLIBS) - + @@ -33,6 +33,7 @@ CMCFLAGS= -Os PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris - + LUA_A= liblua.a +LUA_SO= liblua.so 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 @@ -62,17 +62,17 @@ diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) @@ -44,7 +45,7 @@ LUAC_T= luac LUAC_O= luac.o - + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) +ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) ALL_A= $(LUA_A) - + # Targets start here. @@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O) $(AR) $@ $(BASE_O) $(RANLIB) $@ - + +$(LUA_SO): $(CORE_O) $(LIB_O) + $(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) + ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) @@ -80,4 +80,4 @@ diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile + $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - + diff --git a/programming/language/lua/pspec.xml b/programming/language/lua/pspec.xml index 121066f6cb..b7596ff922 100644 --- a/programming/language/lua/pspec.xml +++ b/programming/language/lua/pspec.xml @@ -13,7 +13,7 @@ lua A light-weight programming language lua is a powerful light-weight programming language designed for extending applications. - http://www.lua.org/ftp/lua-5.4.4.tar.gz + http://www.lua.org/ftp/lua-5.4.7.tar.gz lua.pc @@ -55,6 +55,13 @@ + + 2024-10-06 + 5.4.7 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2022-12-28 5.4.4