made lua dynamic

4 files changed, 74 insertions, 12 deletions

diff --git a/repos/community/lua/.checksum b/repos/community/lua/.checksum
index 256b679c..d204b3cd 100644
--- a/repos/community/lua/.checksum
+++ b/repos/community/lua/.checksum
@@ -1 +1,2 @@
-489c82425cda485b0147e56a0fe73559169d12e7da0ac32bdf4593ce1835faf6  lua-5.5.0.tar.gz
\ No newline at end of file
+489c82425cda485b0147e56a0fe73559169d12e7da0ac32bdf4593ce1835faf6  lua-5.5.0.tar.gz
+0e916389b571a276a37db67c5496c7d8d19286b288764320cd1ba5d37c1cb9c1  makefile.patch
diff --git a/repos/community/lua/.files b/repos/community/lua/.files
index e5bc11cd..3b9907f0 100644
--- a/repos/community/lua/.files
+++ b/repos/community/lua/.files
@@ -1,7 +1,7 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
--rwxr-xr-x root/root    usr/bin/lua
--rwxr-xr-x root/root    usr/bin/luac
+-rwxr-xr-x root/root    usr/bin/lua5.5
+-rwxr-xr-x root/root    usr/bin/luac5.5
 drwxr-xr-x root/root    usr/include/
 -rw-r--r-- root/root    usr/include/lauxlib.h
 -rw-r--r-- root/root    usr/include/lua.h
@@ -9,7 +9,9 @@ drwxr-xr-x root/root    usr/include/
 -rw-r--r-- root/root    usr/include/luaconf.h
 -rw-r--r-- root/root    usr/include/lualib.h
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/liblua.a
+-rw-r--r-- root/root    usr/lib/liblua5.5.so
+-rw-r--r-- root/root    usr/lib/liblua5.5.so.5.5
+-rw-r--r-- root/root    usr/lib/liblua5.5.so.5.5.0
 drwxr-xr-x root/root    usr/lib/lua/
 drwxr-xr-x root/root    usr/lib/lua/5.5/
 drwxr-xr-x root/root    usr/man/
diff --git a/repos/community/lua/abuild b/repos/community/lua/abuild
index abf5d4cf..28c6130a 100644
--- a/repos/community/lua/abuild
+++ b/repos/community/lua/abuild
@@ -1,14 +1,10 @@
 name=lua
 version=5.5.0
 release=1
-source="https://www.lua.org/ftp/lua-$version.tar.gz"
-keep_static=1
+source="https://www.lua.org/ftp/lua-$version.tar.gz
+makefile.patch"
 
 build() {
-	make MYCFLAGS="-fPIC $CFLAGS" MYLDFLAGS="$LDFLAGS" linux
-	make install \
-		INSTALL_DATA='cp -d' \
-		INSTALL_TOP=$PKG/usr \
-		INSTALL_INC=$PKG/usr/include/lua55 \
-		INSTALL_MAN=$PKG/usr/share/man/man1
+	make linux MYCFLAGS="-fPIC"
+	make install INSTALL_TOP=$PKG/usr
 }
diff --git a/repos/community/lua/makefile.patch b/repos/community/lua/makefile.patch
new file mode 100644
index 00000000..40301101
--- /dev/null
+++ b/repos/community/lua/makefile.patch
@@ -0,0 +1,63 @@
+--- old/Makefile
++++ new/Makefile
+@@ -39,9 +39,9 @@
+ PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris
+ 
+ # What to install.
+-TO_BIN= lua luac
++TO_BIN= lua5.5 luac5.5
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua5.5.so.$(R) liblua5.5.so.$(V) liblua5.5.so
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -52,7 +52,7 @@
+ 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)
+--- old/src/Makefile.orig
++++ new/src/Makefile
+@@ -32,19 +32,20 @@
+ 
+ PLATS= guess aix bsd c89 freebsd generic ios linux macosx mingw posix solaris
+ 
+-LUA_A=	liblua.a
++LUA_A=	liblua5.5.a
++LUA_SO=	liblua5.5.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
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+ 
+-LUA_T=	lua
++LUA_T=	lua5.5
+ LUA_O=	lua.o
+ 
+-LUAC_T=	luac
++LUAC_T=	luac5.5
+ 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_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +60,11 @@
+ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
++
++$(LUA_SO): $(BASE_O)
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $^ -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+