Support configurations without syslogd/klogd.

[openwrt.git] / package / lua / Makefile

diff --git a/package/lua/Makefile b/package/lua/Makefile
index c770637..67f3175 100644 (file)
--- 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.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,19 +9,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
 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_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
+PKG_BUILD_DEPENDS:=lua/host

 
 

+include $(INCLUDE_DIR)/host-build.mk

 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua/Default
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua/Default


@@ -84,22 +85,41 @@ $(call Package/lua/Default/description)
  This package contains LUA language examples.
 endef
 
  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
 
 endef
 

-TARGET_CFLAGS += -DLUA_USE_LINUX
+# 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" \
 
 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 \
                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) \
                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) \
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -113,13 +133,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/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
        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
 endef
 
 define Package/lua/install


@@ -138,6 +158,7 @@ define Package/lua-examples/install
                $(1)/usr/share/lua/examples/
 endef
 
                $(1)/usr/share/lua/examples/
 endef
 

+$(eval $(call HostBuild))

 $(eval $(call BuildPackage,liblua))
 $(eval $(call BuildPackage,lua))
 $(eval $(call BuildPackage,luac))
 $(eval $(call BuildPackage,liblua))
 $(eval $(call BuildPackage,lua))
 $(eval $(call BuildPackage,luac))