ath79: update WA/XC devices UBNT_VERSION to 8.7.4

[openwrt/staging/wigyori.git] / package / utils / lua / Makefile

diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 72d56316b45dc484888d219aebd98e651edbe415..36d332f1c762b0a427f14c98efb1dcff67c43bae 100644 (file)
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,18 +9,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lua
 PKG_VERSION:=5.1.5
-PKG_RELEASE:=1
+PKG_RELEASE:=11
 
 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:=2e115fe26e435e33b0d5c022e4490567
+PKG_SOURCE_URL:=https://www.lua.org/ftp/ \
+       https://www.tecgraf.puc-rio.br/lua/ftp/
+PKG_HASH:=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
 PKG_BUILD_PARALLEL:=1
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYRIGHT
+PKG_CPE_ID:=cpe:/a:lua:lua
+
+PKG_BUILD_FLAGS:=no-lto
 
 HOST_PATCH_DIR := ./patches-host
 
@@ -32,8 +33,8 @@ define Package/lua/Default
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Lua programming language
-  URL:=http://www.lua.org/
-  MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+  URL:=https://www.lua.org/
+  MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 endef
 
 define Package/lua/Default/description
@@ -48,6 +49,7 @@ $(call Package/lua/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= (libraries)
+  ABI_VERSION:=5.1.5
 endef
 
 define Package/liblua/description
@@ -93,12 +95,6 @@ endef
 
 TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99
 
-ifneq ($(CONFIG_USE_GLIBC),)
-  ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
-    TARGET_CFLAGS += -DNO_GETLOGIN
-  endif
-endif
-
 define Build/Compile
        $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CROSS)gcc" \
@@ -117,7 +113,7 @@ define Build/Compile
 endef
 
 define Host/Configure
-       $(SED) 's,"/usr/local/","$(STAGING_DIR_HOST)/",' $(HOST_BUILD_DIR)/src/luaconf.h
+       $(SED) 's,"/usr/local/","$(STAGING_DIR_HOSTPKG)/",' $(HOST_BUILD_DIR)/src/luaconf.h
 endef
 
 ifeq ($(HOST_OS),Darwin)
@@ -132,19 +128,27 @@ endif
 
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) \
-               CC="$(HOSTCC) -std=gnu99" \
+               CC="$(HOSTCC) $(HOST_FPIC) -std=gnu99" \
                $(LUA_OS)
 endef
 
 define Host/Install
        $(MAKE) -C $(HOST_BUILD_DIR) \
-               INSTALL_TOP="$(STAGING_DIR_HOST)" \
+               INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
                install
+
+       $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/pkgconfig
+       $(CP) $(HOST_BUILD_DIR)/etc/lua.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua5.1.pc
+
+       $(LN) lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
+       $(LN) luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
+       $(LN) lua5.1.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua.pc
 endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/lua.hpp $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
@@ -161,12 +165,14 @@ endef
 
 define Package/lua/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua5.1 $(1)/usr/bin/
+       $(LN) lua5.1 $(1)/usr/bin/lua
 endef
 
 define Package/luac/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac5.1 $(1)/usr/bin/
+       $(LN) luac5.1 $(1)/usr/bin/luac
 endef
 
 define Package/lua-examples/install