From 9cbba08f01e6cbe03b3c03dd14c16ade5c75fe7e Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 22 Feb 2009 18:10:23 +0000 Subject: merge host build of lua from tools/ into package/lua/Makefile git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14622 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/lua/Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/lua/Makefile b/package/lua/Makefile index eff31390a..0c2e8e24e 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -19,6 +19,7 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ http://www.tecgraf.puc-rio.br/lua/ftp/ PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk define Package/lua/Default @@ -81,9 +82,21 @@ $(call Package/lua/Default/description) This package contains LUA language examples. endef -define Build/Configure +# Host build +define Host/Configure + +endef + +define Host/Compile + $(MAKE) -C $(HOST_BUILD_DIR)/src luac-host 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),) @@ -92,6 +105,8 @@ ifneq ($(CONFIG_USE_EGLIBC),) endif endif +Build/Configure=$(Host/Configure) + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CROSS)gcc" \ @@ -140,6 +155,7 @@ 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)) -- cgit v1.2.3