Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 41 additions & 6 deletions lang/lua/luaexpat/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
#
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
Expand All @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luaexpat
PKG_VERSION:=1.5.2
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=$(PKG_VERSION)
Expand All @@ -22,19 +22,46 @@ PKG_CPE_ID:=cpe:/a:matthewwild:luaexpat

include $(INCLUDE_DIR)/package.mk

define Package/luaexpat
define Package/luaexpat/default
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=LuaExpat
URL:=https://lunarmodules.github.io/luaexpat/
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
endef

define Package/luaexpat
$(Package/luaexpat/default)
DEPENDS:=+lua +libexpat
VARIANT:=lua-51
DEFAULT_VARIANT:=1
endef

define Package/luaexpat/description
define Package/luaexpat5.4
$(Package/luaexpat/default)
TITLE+= (Lua 5.4)
DEPENDS:=+lua5.4 +libexpat
VARIANT:=lua-54
endef

define Package/luaexpat/default/description
LuaExpat is a SAX XML parser based on the Expat library.
endef
Package/luaexpat/description = $(Package/luaexpat/default/description)
Package/luaexpat5.4/description = $(Package/luaexpat/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

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: LUA_INSTALL_DIR is set for both variants here but never referenced — the Package/luaexpat*/install recipes hardcode /usr/lib/lua and /usr/lib/lua/5.4. In the sibling luasec/luafilesystem Makefiles of this same series the identical variable drives the install path, so this reads as leftover dead code. Either use it in the install recipes or drop it.


Generated by Claude Code

endif

define Build/Configure
endef
Expand All @@ -43,10 +70,10 @@ define Build/Compile
$(CP) files/compat-5.1r5 $(PKG_BUILD_DIR)/compat-5.1r5
$(MAKE) -C $(PKG_BUILD_DIR) \
EXPAT_INC="-I$(STAGING_DIR)/usr/include/" \
LUA_INC="-I$(STAGING_DIR)/usr/include/" \
LUA_INC="-I$(LUA_INCDIR)" \
LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
LDFLAGS="-shared $(TARGET_LDFLAGS)" \
LDFLAGS="-shared $(TARGET_LDFLAGS) -l$(LUA_LIBNAME)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) $(FPIC) -std=c99" \
LD="$(TARGET_CROSS)ld -shared"
endef
Expand All @@ -58,4 +85,12 @@ define Package/luaexpat/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/lxp
endef

define Package/luaexpat5.4/install
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp.so $(1)/usr/lib/lua/5.4/lxp.so
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4/lxp
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lxp/lom.lua $(1)/usr/lib/lua/5.4/lxp
endef

$(eval $(call BuildPackage,luaexpat))
$(eval $(call BuildPackage,luaexpat5.4))
53 changes: 43 additions & 10 deletions lang/lua/luafilesystem/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luafilesystem
PKG_VERSION:=1.9.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=MIT

PKG_MIRROR_HASH:=a64d8299c7c875bd2183f82f9a71f6fcc7610ee7377add0b6069fea3d7355073
Expand All @@ -19,48 +19,81 @@ PKG_SOURCE_PROTO:=git

include $(INCLUDE_DIR)/package.mk

define Package/luafilesystem
define Package/luafilesystem/default
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=LuaFileSystem
URL:=https://lunarmodules.github.io/luafilesystem/
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
endef

define Package/luafilesystem
$(Package/luafilesystem/default)
DEPENDS:=+liblua
VARIANT:=lua-51
DEFAULT_VARIANT:=1
endef

define Package/luafilesystem5.4
$(Package/luafilesystem/default)
TITLE+= (Lua 5.4)
DEPENDS:=+liblua5.4
VARIANT:=lua-54
endef

define Package/luafilesystem/description
define Package/luafilesystem/default/description
This package contains the LuaFileSystem library, a set of portable
functions for directory creation, listing and deletion and for file
locking.
endef
Package/luafilesystem/description = $(Package/luafilesystem/default/description)
Package/luafilesystem5.4/description = $(Package/luafilesystem/default/description)

ifeq ($(BUILD_VARIANT),lua-51)
LUA_VERSION:=5.1
LUA_LIBNAME:=lua
LUA_INCDIR:=$(STAGING_DIR)/usr/include
LUA_INSTALL_DIR:=/usr/lib/lua
endif

ifeq ($(BUILD_VARIANT),lua-54)
LUA_VERSION:=5.4

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: LUA_VERSION is defined for both variants but is never referenced anywhere in the Makefile (compile, install and InstallDev all use LUA_LIBNAME/LUA_INCDIR/LUA_INSTALL_DIR instead). It can be dropped.


Generated by Claude Code

LUA_LIBNAME:=lua5.4
LUA_INCDIR:=$(STAGING_DIR)/usr/include/lua5.4
LUA_INSTALL_DIR:=/usr/lib/lua/5.4
endif

define Build/Configure
endef

TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)

TARGET_LDFLAGS += -llua
TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -I$(LUA_INCDIR)

define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
LDFLAGS="$(TARGET_LDFLAGS)"
LDFLAGS="$(TARGET_LDFLAGS) -l$(LUA_LIBNAME)"
$(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o
endef

define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/usr/include
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua
$(INSTALL_DIR) $(STAGING_DIR)$(LUA_INSTALL_DIR)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)$(LUA_INSTALL_DIR)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)$(LUA_INSTALL_DIR)
endef

define Package/luafilesystem/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so
endef

define Package/luafilesystem5.4/install
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/5.4/lfs.so
endef

$(eval $(call BuildPackage,luafilesystem))
$(eval $(call BuildPackage,luafilesystem5.4))
50 changes: 43 additions & 7 deletions lang/lua/luasec/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)?
Expand All @@ -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
endef

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/description
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)
Expand All @@ -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))
22 changes: 21 additions & 1 deletion lang/lua/luasocket/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luasocket
PKG_VERSION:=3.1.0
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
Expand Down Expand Up @@ -44,6 +44,13 @@ define Package/luasocket5.3
VARIANT:=lua-53
endef

define Package/luasocket5.4
$(Package/luasocket/default)
TITLE:=LuaSocket 5.4
DEPENDS:=+liblua5.4
VARIANT:=lua-54
endef

ifeq ($(BUILD_VARIANT),lua-51)
LUA_VERSION=5.1
endif
Expand All @@ -52,6 +59,10 @@ ifeq ($(BUILD_VARIANT),lua-53)
LUA_VERSION=5.3
endif

ifeq ($(BUILD_VARIANT),lua-54)
LUA_VERSION=5.4
endif


define Package/luasocket/default/description
LuaSocket is the most comprehensive networking support
Expand All @@ -60,6 +71,7 @@ define Package/luasocket/default/description
endef
Package/luasocket/description = $(Package/luasocket/default/description)
Package/luasocket5.3/description = $(Package/luasocket/default/description)
Package/luasocket5.4/description = $(Package/luasocket/default/description)

define Build/Configure
endef
Expand Down Expand Up @@ -95,6 +107,14 @@ define Package/luasocket5.3/install
install
endef

define Package/luasocket5.4/install
$(MAKE) -C $(PKG_BUILD_DIR)/src \
DESTDIR="$(1)" \
LUAV=$(LUA_VERSION) \
install
endef


$(eval $(call BuildPackage,luasocket))
$(eval $(call BuildPackage,luasocket5.3))
$(eval $(call BuildPackage,luasocket5.4))
Loading
Loading