void-packages/srcpkgs/lua/patches/liblua.so.patch
Jürgen Buchmüller b8918e2a7d lua: update to 5.3.1
+ Rename lua and lua-devel to lua52 and lua52-devel
+ Modify packages depending on lua52 accordingly:
+ Many packages auto-detect lua52 files
+ Some packages need hints where / how to find lua52
+ One package (xmoto) downgraded to lua51, because it wouldn't find lua52
+ One package (vim) upgraded to lua (5.3.1)

There may be more packages upgradable without problems.
I didn't want to change too much in this move without the
respective package maintainers first taking a look.

Most notably conky-cli wouldn't work with lua52. I upgraded it
to 1.10.0 (same as conky) and tried to keep the flags the same
for the change from gnu-configure to cmake.
2015-10-02 11:24:59 +02:00

54 lines
1.5 KiB
Diff

--- Makefile 2012-05-17 16:05:54.000000000 +0200
+++ Makefile 2012-09-12 22:39:07.162748096 +0200
@@ -52,7 +52,7 @@
all: $(PLAT)
$(PLATS) clean:
- cd src && $(MAKE) $@
+ cd src && $(MAKE) $@ V=$(V) R=$(R)
test: dummy
src/lua -v
--- src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
+++ src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
@@ -188,7 +188,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 "/"
#define LUA_PATH_DEFAULT \
--- src/Makefile 2012-03-09 17:32:16.000000000 +0100
+++ src/Makefile 2012-09-12 22:38:08.591386896 +0200
@@ -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 $(LDFLAGS)
+ 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)