diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-19 13:44:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-04-19 13:44:40 +0000 |
| commit | 98e70367c945adeee38b2deaf719fd7d628e3cd8 (patch) | |
| tree | 11d6ecbaebe767147c1675bc5ba94520b071d176 /package/lua/Makefile | |
| parent | a9f97c3def095e7a3bbd010593ce95ee33fd17fd (diff) | |
| download | upstream-98e70367c945adeee38b2deaf719fd7d628e3cd8.tar.gz upstream-98e70367c945adeee38b2deaf719fd7d628e3cd8.tar.bz2 upstream-98e70367c945adeee38b2deaf719fd7d628e3cd8.zip | |
lua: revert r15108 & r15109
SVN-Revision: 15256
Diffstat (limited to 'package/lua/Makefile')
| -rw-r--r-- | package/lua/Makefile | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/package/lua/Makefile b/package/lua/Makefile index 13eb4a518a..afd599a371 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.1.4 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -18,10 +18,6 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ http://www.tecgraf.puc-rio.br/lua/ftp/ PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 -HOST_PATCH_DIR=./patches-host -PKG_BUILD_DEPENDS:=lua/host zlib - -include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk define Package/lua/Default @@ -84,21 +80,9 @@ $(call Package/lua/Default/description) This package contains LUA language examples. endef -# Host build -define Host/Configure - -endef - -define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR)/src luac-host +define Build/Configure endef -define Host/Install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/luac-host $(STAGING_DIR_HOST)/bin/luac -endef - -# Target build - TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) ifneq ($(CONFIG_USE_EGLIBC),) @@ -107,8 +91,6 @@ ifneq ($(CONFIG_USE_EGLIBC),) endif endif -Build/Configure=$(Host/Configure) - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CROSS)gcc" \ @@ -157,7 +139,6 @@ define Package/lua-examples/install $(1)/usr/share/lua/examples/ endef -$(eval $(call HostBuild)) $(eval $(call BuildPackage,liblua)) $(eval $(call BuildPackage,lua)) $(eval $(call BuildPackage,luac)) |