* Added own custom version of Lua

* Updated Lua to produce architecture-independent bytecode
* Updated Lua to load bytecode from different endianess
* Updated Lua to use optimized integer arithmetic for CPUs without an FPU
* Updated haserl-lua to fit to optimized Lua version (hopefully this should fix: "bad header in precompiled chunk" on some platforms)
* Luci core will now be bytecompiled and stripped by default to save disk space and CPU time

1 files changed, 149 insertions, 0 deletions

diff --git a/contrib/package/lua-luci/Makefile b/contrib/package/lua-luci/Makefile
new file mode 100644
index 0000000000..b01d3f820f
--- /dev/null
+++ b/contrib/package/lua-luci/Makefile
@@ -0,0 +1,149 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 10499 2008-02-19 23:40:28Z nico $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua
+PKG_VERSION:=5.1.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.lua.org/ftp/ \
+	http://ftp.gwdg.de/pub/languages/lua/ \
+	http://mirrors.dotsrc.org/lua/ \
+	http://www.tecgraf.puc-rio.br/lua/ftp/
+PKG_MD5SUM:=a70a8dfaa150e047866dc01a46272599
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+X_HOST_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-luci
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua-luci/Default
+  SUBMENU:=LUA
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LUA programming language
+  URL:=http://www.lua.org/
+endef
+
+define Package/lua-luci/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-luci
+$(call Package/lua-luci/Default)
+  SUBMENU:=
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (libraries)
+endef
+
+define Package/liblua-luci/description
+$(call Package/lua-luci/Default/description)
+ This package contains the LUA shared libraries, needed by other programs.
+endef
+
+define Package/lua-luci
+$(call Package/lua-luci/Default)
+  DEPENDS:=+liblua-luci +libreadline +libncurses
+  TITLE+= (interpreter)
+endef
+
+define Package/lua-luci/description
+$(call Package/lua-luci/Default/description)
+ This package contains the LUA language interpreter.
+endef
+
+define Package/luac-luci
+$(call Package/lua-luci/Default)
+  DEPENDS:=+liblua-luci
+  TITLE+= (compiler)
+endef
+
+define Package/luac/description
+$(call Package/lua-luci/Default/description)
+ This package contains the LUA language compiler.
+endef
+
+define Package/lua-luci-examples
+$(call Package/lua-luci/Default)
+  DEPENDS:=lua-luci
+  TITLE+= (examples)
+endef
+
+define Package/lua-luci-examples/description
+$(call Package/lua-luci/Default/description)
+ This package contains LUA language examples.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	cp $(PKG_BUILD_DIR)/src $(PKG_BUILD_DIR)/src-host -R
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CROSS)gcc" \
+		LD="$(TARGET_CROSS)ld" \
+		AR="$(TARGET_CROSS)ar rcu" \
+		RANLIB="$(TARGET_CROSS)ranlib" \
+		INSTALL_ROOT=/usr \
+		MYCFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+		MYLDFLAGS="$(TARGET_LDFLAGS)" \
+		PKG_VERSION=$(PKG_VERSION) \
+		all linux 
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		INSTALL_TOP="$(PKG_INSTALL_DIR)/usr" \
+		install
+	$(MAKE) -C $(PKG_BUILD_DIR)/src-host luac-host
+	mkdir -p $(X_HOST_DIR)
+	cp $(PKG_BUILD_DIR)/src-host/luac-host $(X_HOST_DIR)/luac
+endef
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so.*} $(1)/usr/lib/
+	ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblua.so
+	ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so
+endef
+
+define Package/liblua-luci/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/
+endef
+
+define Package/lua-luci/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+endef
+
+define Package/luac-luci/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+endef
+
+define Package/lua-luci-examples/install
+	$(INSTALL_DIR) $(1)/usr/share/lua/examples
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/test/*.lua \
+		$(1)/usr/share/lua/examples/
+endef
+
+$(eval $(call BuildPackage,liblua-luci))
+$(eval $(call BuildPackage,lua-luci))
+$(eval $(call BuildPackage,luac-luci))
+$(eval $(call BuildPackage,lua-luci-examples))