diff --git a/srcpkgs/lua/patches/liblua.so.patch b/srcpkgs/lua/patches/liblua.so.patch index b9dd134edac..f2b3d62222c 100644 --- a/srcpkgs/lua/patches/liblua.so.patch +++ b/srcpkgs/lua/patches/liblua.so.patch @@ -1,6 +1,6 @@ ---- Makefile 2012-05-17 16:05:54.000000000 +0200 -+++ Makefile 2012-09-12 22:39:07.162748096 +0200 -@@ -52,7 +52,7 @@ +--- Makefile ++++ Makefile +@@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) $(PLATS) clean: @@ -9,28 +9,17 @@ 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 +--- src/Makefile ++++ src/Makefile +@@ -29,6 +29,7 @@ MYOBJS= + PLATS= aix bsd c89 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 @@ +@@ -43,7 +44,7 @@ LUAC_T= luac LUAC_O= luac.o ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) @@ -39,12 +28,12 @@ ALL_A= $(LUA_A) # Targets start here. -@@ -59,6 +60,12 @@ +@@ -59,6 +60,12 @@ $(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 $(LDFLAGS) ++ $(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) + @@ -52,3 +41,15 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +--- src/luaconf.h ++++ src/luaconf.h +@@ -175,7 +175,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 \ + diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template index 9545ada3635..9d8c472e4ad 100644 --- a/srcpkgs/lua/template +++ b/srcpkgs/lua/template @@ -1,14 +1,14 @@ # Template file for 'lua' pkgname=lua -version=5.3.4 -revision=2 +version=5.3.5 +revision=1 makedepends="ncurses-devel readline-devel" short_desc="Powerful, fast, lightweight, embeddable scripting language" maintainer="Juan RP " -homepage="http://www.lua.org" license="MIT" -distfiles="http://www.lua.org/ftp/lua-$version.tar.gz" -checksum=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c +homepage="http://www.lua.org" +distfiles="http://www.lua.org/ftp/lua-${version}.tar.gz" +checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac alternatives=" lua:lua:/usr/bin/lua5.3 @@ -27,6 +27,11 @@ alternatives=" lua:lua:/usr/share/doc/lua5.3 " +pre_build() { + # Lua 5.3.4 has wrong release version in its Makefile. Fix it. + sed "s/^R= \$V.4/R= \$V.5/" -i Makefile +} + do_build() { sed -i src/Makefile -r \ -e '/^LUA_(SO|A|T)=/ s;lua;lua5.3;' \