diff --git a/lang/lua/luasec/Makefile b/lang/lua/luasec/Makefile index 9d60604c6b..6da10db2c0 100644 --- a/lang/lua/luasec/Makefile +++ b/lang/lua/luasec/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec PKG_VERSION:=1.3.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/brunoos/luasec/tar.gz/v$(PKG_VERSION)? @@ -24,31 +24,58 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/luasec +define Package/luasec/default SUBMENU:=Lua SECTION:=lang CATEGORY:=Languages TITLE:=LuaSec URL:=https://github.com/brunoos/luasec - DEPENDS:=+lua +libopenssl +luasocket endef -define Package/luasec/description +define Package/luasec + $(Package/luasec/default) + DEPENDS:=+lua +libopenssl +luasocket + VARIANT:=lua-51 + DEFAULT_VARIANT:=1 +endef + +define Package/luasec5.4 + $(Package/luasec/default) + TITLE+= (Lua 5.4) + DEPENDS:=+lua5.4 +libopenssl +luasocket5.4 + VARIANT:=lua-54 +endef + +define Package/luasec/default/description LuaSec is a binding for OpenSSL library to provide TLS/SSL communication. endef +Package/luasec/description = $(Package/luasec/default/description) +Package/luasec5.4/description = $(Package/luasec/default/description) + +ifeq ($(BUILD_VARIANT),lua-51) + LUA_INCDIR:=$(STAGING_DIR)/usr/include + LUA_LIBNAME:=lua + LUA_INSTALL_DIR:=/usr/lib/lua +endif + +ifeq ($(BUILD_VARIANT),lua-54) + LUA_INCDIR:=$(STAGING_DIR)/usr/include/lua5.4 + LUA_LIBNAME:=lua5.4 + LUA_INSTALL_DIR:=/usr/lib/lua/5.4 +endif define Build/Configure endef -TARGET_CFLAGS += $(FPIC) -TARGET_LDFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) -I$(LUA_INCDIR) +TARGET_LDFLAGS += $(FPIC) -l$(LUA_LIBNAME) MAKE_FLAGS += \ LD="$(TARGET_CC)" \ INC_PATH="" \ LIB_PATH="" \ - LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \ - LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" + LUACPATH="$(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)" \ + LUAPATH="$(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)" define Build/Compile $(call Build/Compile/Default,linux) @@ -62,4 +89,13 @@ define Package/luasec/install $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/ssl/https.lua $(1)/usr/lib/lua/ssl/ endef +define Package/luasec5.4/install + $(INSTALL_DIR) $(1)/usr/lib/lua/5.4 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/ssl.so $(1)/usr/lib/lua/5.4/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/ssl.lua $(1)/usr/lib/lua/5.4/ + $(INSTALL_DIR) $(1)/usr/lib/lua/5.4/ssl + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/ssl/https.lua $(1)/usr/lib/lua/5.4/ssl/ +endef + $(eval $(call BuildPackage,luasec)) +$(eval $(call BuildPackage,luasec5.4))