diff --git a/programming/language/lua52/actions.py b/programming/language/lua52/actions.py index bdc986284b..d5dc1232d9 100755 --- a/programming/language/lua52/actions.py +++ b/programming/language/lua52/actions.py @@ -10,15 +10,19 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def build(): - shelltools.system("sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' -e '/^LUAC_T=/ s/luac/luac5.2/' \ - -i src/Makefile") - pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -DLUA_USE_LINUX" % get.CFLAGS()) - pisitools.dosed("src/Makefile", "^MYLDFLAGS.*$", "MYLDFLAGS=%s" % get.LDFLAGS()) - autotools.make("linux") + shelltools.system("sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h") + shelltools.system("sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' \ + -e '/^LUAC_T=/ s/luac/luac5.2/' \ + -i src/Makefile") + + + # pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -DLUA_USE_LINUX" % get.CFLAGS()) + # pisitools.dosed("src/Makefile", "^MYLDFLAGS.*$", "MYLDFLAGS=%s" % get.LDFLAGS()) + autotools.make("MYCFLAGS=\"-fPIC\" MYLDFLAGS=\"$LDFLAGS\" linux") def install(): options = "TO_BIN=\"lua5.2 luac5.2\" \ - TO_LIB=\"liblua5.2.a liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.5.2.4 \" \ + TO_LIB='liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.5.2.4' \ INSTALL_DATA=\"cp -d\" \ INSTALL_TOP=\"%s/usr\" \ INSTALL_INC=\"%s/usr/include/lua5.2\" \ @@ -29,9 +33,13 @@ def install(): pisitools.removeDir("/usr/lib/lua") pisitools.dosym("/usr/lib/liblua5.2.so", "/usr/lib/liblua.so.5.2") + pisitools.dosym("/usr/lib/liblua5.2.so", "/usr/lib/liblua.so.5.2.4") docs = [ "*.html", "*.png", "*.css", "*.gif" ] for d in docs: pisitools.insinto("/usr/share/doc/lua5.2", "doc/%s" % d) pisitools.rename("/usr/share/man/man1/lua.1", "lua.5.2.1") pisitools.rename("/usr/share/man/man1/luac.1", "luac.5.2.1") + + pisitools.dosym("/usr/lib/pkgconfig/lua5.2.pc", "/usr/lib/pkgconfig/lua-5.2.pc") + pisitools.dosym("/usr/lib/pkgconfig/lua5.2.pc", "/usr/lib/pkgconfig/lua52.pc") diff --git a/programming/language/lua52/files/lua-5.2.4-shared_library-1.patch b/programming/language/lua52/files/lua-5.2.4-shared_library-1.patch new file mode 100644 index 0000000000..a37fd64dd1 --- /dev/null +++ b/programming/language/lua52/files/lua-5.2.4-shared_library-1.patch @@ -0,0 +1,61 @@ +Submitted By: Igor Živković +Date: 2013-06-19 +Initial Package Version: 5.2.2 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library. + +diff -Naur lua-5.2.2.orig/Makefile lua-5.2.2/Makefile +--- lua-5.2.2.orig/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.2/Makefile 2013-06-19 20:04:12.338167412 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -Naur lua-5.2.2.orig/src/Makefile lua-5.2.2/src/Makefile +--- lua-5.2.2.orig/src/Makefile 2012-12-27 11:51:43.000000000 +0100 ++++ lua-5.2.2/src/Makefile 2013-06-19 20:04:40.924213226 +0200 +@@ -7,7 +7,7 @@ + PLAT= none + + CC= gcc +-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux 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 +@@ -43,7 +44,7 @@ + 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. +@@ -59,6 +60,12 @@ + $(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) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/programming/language/lua52/files/lua.pc b/programming/language/lua52/files/lua.pc index 6a1fe36b28..6ab3fa0728 100755 --- a/programming/language/lua52/files/lua.pc +++ b/programming/language/lua52/files/lua.pc @@ -5,7 +5,7 @@ prefix=/usr INSTALL_BIN=${prefix}/bin INSTALL_INC=${prefix}/include/lua5.2 INSTALL_LIB=${prefix}/lib -INSTALL_MAN=${prefix}/man/man1 +INSTALL_MAN=${prefix}/share/man/man1 INSTALL_LMOD=${prefix}/share/lua/${V} INSTALL_CMOD=${prefix}/lib/lua/${V} exec_prefix=${prefix} @@ -15,6 +15,6 @@ includedir=${prefix}/include/lua5.2 Name: Lua Description: An Extensible Extension Language Version: ${R} -Requires: -Libs: -L${libdir} -llua5.2 -lm +Requires: +Libs: -L${libdir} -llua5.2 -lm -ldl Cflags: -I${includedir} diff --git a/programming/language/lua52/pspec.xml b/programming/language/lua52/pspec.xml index 5bb7d59df1..d7b902fafb 100755 --- a/programming/language/lua52/pspec.xml +++ b/programming/language/lua52/pspec.xml @@ -20,7 +20,7 @@ readline-devel - liblua.so.patch --> + lua-5.2.4-shared_library-1.patch @@ -55,6 +55,13 @@ + + 2023-05-20 + 5.2.4 + Rebuild + PisiLinux Community + admins@pisilinux.org + 2020-01-22 5.2.4