X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/eeed6076b93adcb888fdad24c5d4d52e134c4622..a5b639a6ac04d67e442313b6208814c5b0f9bdf5:/package/lua/Makefile diff --git a/package/lua/Makefile b/package/lua/Makefile index ae6206d3b..96fa57eaa 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -1,34 +1,33 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 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.1.3 -PKG_RELEASE:=1 +PKG_VERSION:=5.1.4 +PKG_RELEASE:=8 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_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +HOST_PATCH_DIR := ./patches-host include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/lua/Default - SUBMENU:=LUA + SUBMENU:=Lua SECTION:=lang CATEGORY:=Languages - TITLE:=LUA programming language + TITLE:=Lua programming language URL:=http://www.lua.org/ endef @@ -48,18 +47,18 @@ endef define Package/liblua/description $(call Package/lua/Default/description) - This package contains the LUA shared libraries, needed by other programs. + This package contains the Lua shared libraries, needed by other programs. endef define Package/lua $(call Package/lua/Default) - DEPENDS:=+liblua +libreadline +libncurses + DEPENDS:=+liblua TITLE+= (interpreter) endef define Package/lua/description $(call Package/lua/Default/description) - This package contains the LUA language interpreter. + This package contains the Lua language interpreter. endef define Package/luac @@ -70,7 +69,7 @@ endef define Package/luac/description $(call Package/lua/Default/description) - This package contains the LUA language compiler. + This package contains the Lua language compiler. endef define Package/lua-examples @@ -81,23 +80,30 @@ endef define Package/lua-examples/description $(call Package/lua/Default/description) - This package contains LUA language examples. + This package contains Lua language examples. endef define Build/Configure endef +TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99 + +ifneq ($(CONFIG_USE_EGLIBC),) + ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) + TARGET_CFLAGS += -DNO_GETLOGIN + endif +endif + 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="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ + 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) \ @@ -105,14 +111,42 @@ define Build/Compile install endef +define Host/Configure + $(SED) 's,"/usr/local/","$(STAGING_DIR_HOST)/",' $(HOST_BUILD_DIR)/src/luaconf.h +endef + +ifeq ($(HOST_OS),Darwin) + LUA_OS:=macosx +else + ifeq ($(HOST_OS),FreeBSD) + LUA_OS:=freebsd + else + LUA_OS:=linux + endif +endif + +define Host/Compile + $(MAKE) -C $(HOST_BUILD_DIR) \ + CC="$(HOSTCC) -std=gnu99" \ + $(LUA_OS) +endef + +define Host/Install + $(MAKE) -C $(HOST_BUILD_DIR) \ + INSTALL_TOP="$(STAGING_DIR_HOST)" \ + install +endef + define Build/InstallDev - mkdir -p $(1)/usr/include + $(INSTALL_DIR) $(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/ - 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 + $(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/ + $(INSTALL_DIR) $(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 + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/etc/lua.pc $(1)/usr/lib/pkgconfig/ endef define Package/liblua/install @@ -140,3 +174,5 @@ $(eval $(call BuildPackage,liblua)) $(eval $(call BuildPackage,lua)) $(eval $(call BuildPackage,luac)) $(eval $(call BuildPackage,lua-examples)) +$(eval $(call HostBuild)) +