summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@crux.nu>2012-03-14 09:02:18 +0100
committerTilman Sauerbeck <tilman@crux.nu>2012-03-14 09:03:35 +0100
commit23c69432fc3dabb131d519f725ddd89c7e8dd889 (patch)
treebfa90bb59efd787fa85e22b84cd1a24e2f6a16bd /lua
parentc9c3c564a5a985bddfb3c8412e2002cf70c383b1 (diff)
downloadopt-23c69432fc3dabb131d519f725ddd89c7e8dd889.tar.gz
opt-23c69432fc3dabb131d519f725ddd89c7e8dd889.tar.xz
lua: updated to 5.2.0.
Diffstat (limited to 'lua')
-rw-r--r--lua/.footprint8
-rw-r--r--lua/.md5sum5
-rw-r--r--lua/Pkgfile11
-rw-r--r--lua/lua.diff115
4 files changed, 74 insertions, 65 deletions
diff --git a/lua/.footprint b/lua/.footprint
index 3ae394423..b3b2a71bf 100644
--- a/lua/.footprint
+++ b/lua/.footprint
@@ -10,10 +10,10 @@ drwxr-xr-x root/root usr/include/
-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
-lrwxrwxrwx root/root usr/lib/liblua.so -> liblua.so.5.1
--rw-r--r-- root/root usr/lib/liblua.so.5.1
+lrwxrwxrwx root/root usr/lib/liblua.so -> liblua.so.5.2
+-rw-r--r-- root/root usr/lib/liblua.so.5.2
drwxr-xr-x root/root usr/lib/lua/
-drwxr-xr-x root/root usr/lib/lua/5.1/
+drwxr-xr-x root/root usr/lib/lua/5.2/
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/lua.pc
drwxr-xr-x root/root usr/man/
@@ -22,4 +22,4 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/luac.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/lua/
-drwxr-xr-x root/root usr/share/lua/5.1/
+drwxr-xr-x root/root usr/share/lua/5.2/
diff --git a/lua/.md5sum b/lua/.md5sum
index 44395c4b0..cb5fc63bb 100644
--- a/lua/.md5sum
+++ b/lua/.md5sum
@@ -1,3 +1,2 @@
-d0870f2de55d59c1c8419f36e8fac150 lua-5.1.4.tar.gz
-f7986425312caab2ec666bc32acb4996 lua.diff
-998ef7886183f61d3a5ca891a9ce6a79 patch-lua-5.1.4-3
+f1ea831f397214bae8a265995ab1a93e lua-5.2.0.tar.gz
+0ad39e3c427889648c477ee9b0b77661 lua.diff
diff --git a/lua/Pkgfile b/lua/Pkgfile
index d67b17b10..74fa0cc1d 100644
--- a/lua/Pkgfile
+++ b/lua/Pkgfile
@@ -4,20 +4,19 @@
# Depends on:
name=lua
-version=5.1.4.3
+version=5.2.0
release=1
-source=(http://www.lua.org/ftp/$name-5.1.4.tar.gz \
- http://www.lua.org/ftp/patch-lua-5.1.4-3 \
+source=(http://www.lua.org/ftp/$name-$version.tar.gz \
$name.diff)
build() {
- cd $name-5.1.4
+ cd $name-$version
- patch -d src -p0 -i $SRC/patch-lua-5.1.4-3
patch -Np1 -i $SRC/$name.diff
make linux
make INSTALL_TOP=$PKG/usr install
- install -D -m 0644 etc/lua.pc $PKG/usr/lib/pkgconfig/lua.pc
+ make pc > lua.pc
+ install -D -m 0644 lua.pc $PKG/usr/lib/pkgconfig/lua.pc
}
diff --git a/lua/lua.diff b/lua/lua.diff
index da2f59aad..179f06781 100644
--- a/lua/lua.diff
+++ b/lua/lua.diff
@@ -1,87 +1,98 @@
-Somewhat based on Arch Linux' Lua patch.
-
-diff -aur lua-5.1.2.orig/Makefile lua-5.1.2/Makefile
---- lua-5.1.2.orig/Makefile 2007-03-25 16:44:39.000000000 +0200
-+++ lua-5.1.2/Makefile 2007-04-09 20:22:39.100496674 +0200
-@@ -43,7 +43,7 @@
+diff -aur lua-5.2.0.orig/Makefile lua-5.2.0/Makefile
+--- lua-5.2.0.orig/Makefile 2011-11-16 00:38:12.000000000 +0100
++++ lua-5.2.0/Makefile 2012-03-14 09:00:52.823998608 +0100
+@@ -10,7 +10,7 @@
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= /usr
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+@@ -41,7 +41,7 @@
# What to install.
TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
-TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.so.5.1
++TO_LIB= liblua.a liblua.so.5.2
TO_MAN= lua.1 luac.1
# Lua version and release.
-@@ -65,6 +65,7 @@
+@@ -63,6 +63,7 @@
+ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+ ln -s liblua.so.5.1 $(INSTALL_LIB)/liblua.so
++ ln -s liblua.so.5.2 $(INSTALL_LIB)/liblua.so
- ranlib:
- cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+ uninstall:
+ cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
+@@ -103,10 +104,14 @@
-diff -aur lua-5.1.2.orig/etc/lua.pc lua-5.1.2/etc/lua.pc
---- lua-5.1.2.orig/etc/lua.pc 2007-03-23 20:58:49.000000000 +0100
-+++ lua-5.1.2/etc/lua.pc 2007-04-09 20:00:26.642825529 +0200
-@@ -8,7 +8,7 @@
- R= 5.1.2
+ # echo pkg-config data
+ pc:
+- @echo "version=$R"
+ @echo "prefix=$(INSTALL_TOP)"
+ @echo "libdir=$(INSTALL_LIB)"
+ @echo "includedir=$(INSTALL_INC)"
++ @echo "Name: Lua"
++ @echo "Description: An Extensible Extension Language"
++ @echo "Version: $R"
++ @echo "Libs: -l$(INSTALL_LIB) -llua -lm"
++ @echo "Cflags: -I$(INSTALL_INC)"
- # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
--prefix= /usr/local
-+prefix= /usr
- INSTALL_BIN= ${prefix}/bin
- INSTALL_INC= ${prefix}/include
- INSTALL_LIB= ${prefix}/lib
-diff -aur lua-5.1.2.orig/src/Makefile lua-5.1.2/src/Makefile
---- lua-5.1.2.orig/src/Makefile 2007-03-25 16:49:23.000000000 +0200
-+++ lua-5.1.2/src/Makefile 2007-04-09 20:20:37.073542755 +0200
-@@ -8,7 +8,8 @@
+ # list targets that do not create files (but not all makes understand .PHONY)
+ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+diff -aur lua-5.2.0.orig/src/Makefile lua-5.2.0/src/Makefile
+--- lua-5.2.0.orig/src/Makefile 2011-09-19 14:45:14.000000000 +0200
++++ lua-5.2.0/src/Makefile 2012-03-14 08:41:50.374000136 +0100
+@@ -7,7 +7,8 @@
PLAT= none
CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
+-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+CFLAGS ?= -O2 -Wall
-+CFLAGS += $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
-@@ -23,6 +24,7 @@
++CFLAGS += -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+
+@@ -29,6 +30,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 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
-@@ -36,7 +38,7 @@
- LUAC_O= luac.o print.o
+ 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 +45,7 @@
+ LUAC_O= luac.o
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_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)
- default: $(PLAT)
-@@ -51,6 +53,10 @@
+ # Targets start here.
+@@ -59,6 +61,10 @@
$(AR) $@ $?
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -shared -Wl,-soname,liblua.so -o $@.5.1 $? $(MYLDFLAGS)
-+ ln -s $@.5.1 $@
++ $(CC) -shared -Wl,-soname,liblua.so -o $@.5.2 $? $(MYLDFLAGS)
++ ln -s $@.5.2 $@
+
$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-diff -aur lua-5.1.2.orig/src/luaconf.h lua-5.1.2/src/luaconf.h
---- lua-5.1.2.orig/src/luaconf.h 2007-03-24 04:01:55.000000000 +0100
-+++ lua-5.1.2/src/luaconf.h 2007-04-09 20:01:00.274480800 +0200
-@@ -94,7 +94,7 @@
- ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+diff -aur lua-5.2.0.orig/src/luaconf.h lua-5.2.0/src/luaconf.h
+--- lua-5.2.0.orig/src/luaconf.h 2011-12-06 17:58:36.000000000 +0100
++++ lua-5.2.0/src/luaconf.h 2012-03-14 08:42:10.370999861 +0100
+@@ -100,7 +100,7 @@
+ #else /* }{ */
- #else
+ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
- #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
#define LUA_PATH_DEFAULT \

Generated by cgit