X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2cc310a5c9f21dcd83860813986d73f1982c0472..b04550ce488951e2452a60b885521ed0f443faec:/package/lua/Makefile

diff --git a/package/lua/Makefile b/package/lua/Makefile
index cdeba906f..c7706376d 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -1,97 +1,144 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
-PKG_VERSION:=5.0.2
-PKG_RELEASE:=1
-PKG_MD5SUM:= dea74646b7e5c621fef7174df83c34b1
+PKG_VERSION:=5.1.3
+PKG_RELEASE:=2
 
-PKG_SOURCE_URL:=http://www.lua.org/ftp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+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
 
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,LIBLUA,liblua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_INTERPRETER,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_COMPILER,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(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="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
-		MYLDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		all so
-	# remove statically linked binaries, so that they will get linked against shlib this time
-	rm -f $(PKG_BUILD_DIR)/bin/lua{,c}
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua/Default
+  SUBMENU:=LUA
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=LUA programming language
+  URL:=http://www.lua.org/
+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
+$(call Package/lua/Default)
+  SUBMENU:=
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= (libraries)
+endef
+
+define Package/liblua/description
+$(call Package/lua/Default/description)
+ This package contains the LUA shared libraries, needed by other programs.
+endef
+
+define Package/lua
+$(call Package/lua/Default)
+  DEPENDS:=+liblua
+  TITLE+= (interpreter)
+endef
+
+define Package/lua/description
+$(call Package/lua/Default/description)
+ This package contains the LUA language interpreter.
+endef
+
+define Package/luac
+$(call Package/lua/Default)
+  DEPENDS:=+liblua
+  TITLE+= (compiler)
+endef
+
+define Package/luac/description
+$(call Package/lua/Default/description)
+ This package contains the LUA language compiler.
+endef
+
+define Package/lua-examples
+$(call Package/lua/Default)
+  DEPENDS:=lua
+  TITLE+= (examples)
+endef
+
+define Package/lua-examples/description
+$(call Package/lua/Default/description)
+ This package contains LUA language examples.
+endef
+
+define Build/Configure
+endef
+
+TARGET_CFLAGS += -DLUA_USE_LINUX
+
+define Build/Compile
 	$(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="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
-		MYLDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		all
+		CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -fPIC" \
+		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_ROOT="$(PKG_INSTALL_DIR)/usr" \
-		install soinstall
-	touch $@
-
-$(IPKG_LIBLUA):
-	install -d -m0755 $(IDIR_LIBLUA)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/
-	$(RSTRIP) $(IDIR_LIBLUA)
-	$(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR)
-
-$(IPKG_LUA_INTERPRETER):
-	install -d -m0755 $(IDIR_LUA_INTERPRETER)/usr/bin
-	cp -fp $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA_INTERPRETER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_INTERPRETER)
-	$(IPKG_BUILD) $(IDIR_LUA_INTERPRETER) $(PACKAGE_DIR)
-
-$(IPKG_LUA_COMPILER):
-	install -d -m0755 $(IDIR_LUA_COMPILER)/usr/bin
-	cp -fp $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUA_COMPILER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_COMPILER)
-	$(IPKG_BUILD) $(IDIR_LUA_COMPILER) $(PACKAGE_DIR)
-
-$(IPKG_LUA_EXAMPLES):
-	install -d -m0755 $(IDIR_LUA_EXAMPLES)/usr/share/lua/examples
-	install -m0644 $(PKG_BUILD_DIR)/test/*.lua \
-		$(IDIR_LUA_EXAMPLES)/usr/share/lua/examples/
-	$(RSTRIP) $(IDIR_LUA_EXAMPLES)
-	$(IPKG_BUILD) $(IDIR_LUA_EXAMPLES) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/liblua.so: $(PKG_BUILD_DIR)/.built
-	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fp $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/
-	cp -fp $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $@
-
-install-dev: $(STAGING_DIR)/usr/lib/liblua.so
-
-uninstall-dev:
-	rm -rf \
-		$(STAGING_DIR)/usr/include/lua{,lib}.h \
-		$(STAGING_DIR)/usr/include/lauxlib.h \
-		$(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*} \
-
-compile: install-dev
-clean: uninstall-dev
+		INSTALL_TOP="$(PKG_INSTALL_DIR)/usr" \
+		install
+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.* $(1)/usr/lib/
+	ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so
+endef
+
+define Package/liblua/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so* $(1)/usr/lib/
+endef
+
+define Package/lua/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+endef
+
+define Package/luac/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+endef
+
+define Package/lua-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))
+$(eval $(call BuildPackage,lua))
+$(eval $(call BuildPackage,luac))
+$(eval $(call BuildPackage,lua-examples))