X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/adde7768a2eab2950a7628319ec832c63a00ff03..c1ae60e7df285725b5ba0b8050c58ec8bc664408:/package/lua/Makefile?ds=inline diff --git a/package/lua/Makefile b/package/lua/Makefile index c7706376d..7f0874bd6 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 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,19 +9,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua -PKG_VERSION:=5.1.3 -PKG_RELEASE:=2 +PKG_VERSION:=5.1.4 +PKG_RELEASE:=3 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 +PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 +HOST_PATCH_DIR=./patches-host +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk define Package/lua/Default @@ -84,22 +83,41 @@ $(call Package/lua/Default/description) This package contains LUA language examples. endef -define Build/Configure +# Host build +define Host/Configure + endef -TARGET_CFLAGS += -DLUA_USE_LINUX +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),) + ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) + TARGET_CFLAGS += -DNO_GETLOGIN + endif +endif + +Build/Configure=$(Host/Configure) 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 \ - CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -fPIC" \ + CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ MYLDFLAGS="$(TARGET_LDFLAGS)" \ PKG_VERSION=$(PKG_VERSION) \ - all linux + linux rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -113,13 +131,13 @@ define Build/InstallDev $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so*} $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/ endef define Package/lua/install @@ -138,6 +156,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))