bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update lua to v5.1.3, fix package descriptions, refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10499 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-02-19 23:40:28 +00:00
parent 4ddceeec1c
commit c555c7c34f
2 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lang/lua/Makefile
View File

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=lua PKG_NAME:=lua
PKG_VERSION:=5.1.2 PKG_VERSION:=5.1.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
http://ftp.gwdg.de/pub/languages/lua/ \ http://ftp.gwdg.de/pub/languages/lua/ \
http://mirrors.dotsrc.org/lua/ \ http://mirrors.dotsrc.org/lua/ \
http://www.tecgraf.puc-rio.br/lua/ftp/ http://www.tecgraf.puc-rio.br/lua/ftp/
PKG_MD5SUM:=687ce4c2a1ddff18f1008490fdc4e5e0 PKG_MD5SUM:=a70a8dfaa150e047866dc01a46272599
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@ -32,8 +32,14 @@ define Package/lua/Default
URL:=http://www.lua.org/ URL:=http://www.lua.org/
endef endef
define Package/lua/Default/description
Lua is a powerful light-weight programming language designed for extending
applications. Lua is also frequently used as a general-purpose, stand-alone
language. Lua is free software.
endef
define Package/liblua define Package/liblua
$(call Package/lua/Default) $(call Package/lua/Default)
SUBMENU:= SUBMENU:=
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
@ -41,49 +47,41 @@ define Package/liblua
endef endef
define Package/liblua/description define Package/liblua/description
= $(call Package/lua/Default/description)
Lua is a powerful light-weight programming language designed for extending This package contains the LUA shared libraries, needed by other programs.
applications. Lua is also frequently used as a general-purpose, stand-alone
language. Lua is free software. This package contains the LUA shared libraries, needed by other programs.
endef endef
define Package/lua define Package/lua
$(call Package/lua/Default) $(call Package/lua/Default)
DEPENDS:=+liblua +libreadline +libncurses DEPENDS:=+liblua +libreadline +libncurses
TITLE+= (interpreter) TITLE+= (interpreter)
endef endef
define Package/lua/description define Package/lua/description
= $(call Package/lua/Default/description)
Lua is a powerful light-weight programming language designed for extending This package contains the LUA language interpreter.
applications. Lua is also frequently used as a general-purpose, stand-alone
language. Lua is free software. This package contains the LUA language interpreter.
endef endef
define Package/luac define Package/luac
$(call Package/lua/Default) $(call Package/lua/Default)
DEPENDS:=+liblua DEPENDS:=+liblua
TITLE+= (compiler) TITLE+= (compiler)
endef endef
define Package/luac/description define Package/luac/description
= $(call Package/lua/Default/description)
Lua is a powerful light-weight programming language designed for extending This package contains the LUA language compiler.
applications. Lua is also frequently used as a general-purpose, stand-alone
language. Lua is free software. This package contains the LUA language compiler.
endef endef
define Package/lua-examples define Package/lua-examples
$(call Package/lua/Default) $(call Package/lua/Default)
DEPENDS:=lua DEPENDS:=lua
TITLE+= (examples) TITLE+= (examples)
endef endef
define Package/lua-examples/description define Package/lua-examples/description
= $(call Package/lua/Default/description)
Lua is a powerful light-weight programming language designed for extending This package contains LUA language examples.
applications. Lua is also frequently used as a general-purpose, stand-alone
language. Lua is free software. This package contains LUA language examples.
endef endef
define Build/Configure define Build/Configure

57
lang/lua/patches/010-shared_liblua.patch
View File

@ -2,10 +2,11 @@
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 OpenWrt.org
# #
diff -ruN lua-5.1.1-old/Makefile lua-5.1.1-new/Makefile Index: lua-5.1.3/Makefile
--- lua-5.1.1-old/Makefile 2006-06-02 12:53:38.000000000 +0200 ===================================================================
+++ lua-5.1.1-new/Makefile 2007-01-09 02:10:39.000000000 +0100 --- lua-5.1.3.orig/Makefile 2008-02-20 00:06:06.000000000 +0100
@@ -42,7 +42,7 @@ +++ lua-5.1.3/Makefile 2008-02-20 00:06:07.000000000 +0100
@@ -38,7 +38,7 @@
# What to install. # What to install.
TO_BIN= lua luac 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 ../etc/lua.hpp
@ -14,11 +15,12 @@ diff -ruN lua-5.1.1-old/Makefile lua-5.1.1-new/Makefile
TO_MAN= lua.1 luac.1 TO_MAN= lua.1 luac.1
# Lua version and release. # Lua version and release.
diff -ruN lua-5.1.1-old/src/Makefile lua-5.1.1-new/src/Makefile Index: lua-5.1.3/src/Makefile
--- lua-5.1.1-old/src/Makefile 2006-03-22 01:41:49.000000000 +0100 ===================================================================
+++ lua-5.1.1-new/src/Makefile 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/Makefile 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/Makefile 2008-02-20 00:06:07.000000000 +0100
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
PLATS= aix ansi bsd generic linux macosx mingw posix solaris PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
LUA_A= liblua.a LUA_A= liblua.a
+LUA_SO= liblua.so +LUA_SO= liblua.so
@ -66,7 +68,7 @@ diff -ruN lua-5.1.1-old/src/Makefile lua-5.1.1-new/src/Makefile
clean: clean:
$(RM) $(ALL_T) $(ALL_O) $(RM) $(ALL_T) $(ALL_O)
@@ -92,7 +100,7 @@ @@ -96,7 +104,7 @@
$(MAKE) all MYCFLAGS= $(MAKE) all MYCFLAGS=
linux: linux:
@ -74,10 +76,11 @@ diff -ruN lua-5.1.1-old/src/Makefile lua-5.1.1-new/src/Makefile
+ $(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + $(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
macosx: macosx:
$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
diff -ruN lua-5.1.1-old/src/ldo.h lua-5.1.1-new/src/ldo.h Index: lua-5.1.3/src/ldo.h
--- lua-5.1.1-old/src/ldo.h 2005-08-24 18:15:49.000000000 +0200 ===================================================================
+++ lua-5.1.1-new/src/ldo.h 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/ldo.h 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/ldo.h 2008-02-20 00:06:07.000000000 +0100
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult); LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize); LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
@ -87,9 +90,10 @@ diff -ruN lua-5.1.1-old/src/ldo.h lua-5.1.1-new/src/ldo.h
LUAI_FUNC void luaD_throw (lua_State *L, int errcode); LUAI_FUNC void luaD_throw (lua_State *L, int errcode);
LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud); LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
diff -ruN lua-5.1.1-old/src/lfunc.h lua-5.1.1-new/src/lfunc.h Index: lua-5.1.3/src/lfunc.h
--- lua-5.1.1-old/src/lfunc.h 2005-04-25 21:24:10.000000000 +0200 ===================================================================
+++ lua-5.1.1-new/src/lfunc.h 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/lfunc.h 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/lfunc.h 2008-02-20 00:06:07.000000000 +0100
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
cast(int, sizeof(TValue *)*((n)-1))) cast(int, sizeof(TValue *)*((n)-1)))
@ -99,9 +103,10 @@ diff -ruN lua-5.1.1-old/src/lfunc.h lua-5.1.1-new/src/lfunc.h
LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e); LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems, Table *e);
LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e); LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems, Table *e);
LUAI_FUNC UpVal *luaF_newupval (lua_State *L); LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
diff -ruN lua-5.1.1-old/src/lmem.h lua-5.1.1-new/src/lmem.h Index: lua-5.1.3/src/lmem.h
--- lua-5.1.1-old/src/lmem.h 2005-04-25 21:24:10.000000000 +0200 ===================================================================
+++ lua-5.1.1-new/src/lmem.h 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/lmem.h 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/lmem.h 2008-02-20 00:06:07.000000000 +0100
@@ -38,9 +38,9 @@ @@ -38,9 +38,9 @@
((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t)))) ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
@ -114,9 +119,10 @@ diff -ruN lua-5.1.1-old/src/lmem.h lua-5.1.1-new/src/lmem.h
LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size, LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
size_t size_elem, int limit, size_t size_elem, int limit,
const char *errormsg); const char *errormsg);
diff -ruN lua-5.1.1-old/src/lstring.h lua-5.1.1-new/src/lstring.h Index: lua-5.1.3/src/lstring.h
--- lua-5.1.1-old/src/lstring.h 2005-04-25 21:24:10.000000000 +0200 ===================================================================
+++ lua-5.1.1-new/src/lstring.h 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/lstring.h 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/lstring.h 2008-02-20 00:06:07.000000000 +0100
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
LUAI_FUNC void luaS_resize (lua_State *L, int newsize); LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
@ -126,9 +132,10 @@ diff -ruN lua-5.1.1-old/src/lstring.h lua-5.1.1-new/src/lstring.h
#endif #endif
diff -ruN lua-5.1.1-old/src/lundump.h lua-5.1.1-new/src/lundump.h Index: lua-5.1.3/src/lundump.h
--- lua-5.1.1-old/src/lundump.h 2005-11-11 15:03:13.000000000 +0100 ===================================================================
+++ lua-5.1.1-new/src/lundump.h 2007-01-09 02:10:45.000000000 +0100 --- lua-5.1.3.orig/src/lundump.h 2008-02-20 00:06:06.000000000 +0100
+++ lua-5.1.3/src/lundump.h 2008-02-20 00:06:07.000000000 +0100
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
LUAI_FUNC void luaU_header (char* h); LUAI_FUNC void luaU_header (char* h);