openwrt-mirror/packages
1
0 Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-10-12 05:57:04 +04:00
Code Issues Packages Projects Releases Wiki Activity

lua: use LUA_INSTALL_DIR in cqueues, lua-ffi and luaossl

Browse Source 
The three Lua variants of each package install the same files, differing
only in the destination directory, so define LUA_INSTALL_DIR next to the
other per-variant settings and share a single install recipe. Same idiom
as luafilesystem, luasec and luaexpat. No packaged path changes.

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
Alexandru Ardelean authored and Alexandru Ardelean committed 2026-10-06 10:40:22 +03:00
1 parent 21b1fefb41
commit 6c5a3c4d78
3 files changed
+25 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lang/lua/cqueues/Makefile
+9 -19
View File
@@ -69,6 +69,7 @@ ifeq ($(BUILD_VARIANT),lua51)
LUA51_CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
lua51cpath="/usr/lib/lua" \
lua51path="/usr/lib/lua"
LUA_INSTALL_DIR:=/usr/lib/lua
endif
ifeq ($(BUILD_VARIANT),lua53)
MAKE_FLAGS += \
@@ -76,6 +77,7 @@ ifeq ($(BUILD_VARIANT),lua53)
LUA53_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.3" \
lua53cpath="/usr/local/lib/lua/5.3" \
lua53path="/usr/local/lib/lua/5.3"
LUA_INSTALL_DIR:=/usr/local/lib/lua/5.3
endif
ifeq ($(BUILD_VARIANT),lua54)
MAKE_FLAGS += \
@@ -83,30 +85,18 @@ ifeq ($(BUILD_VARIANT),lua54)
LUA54_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.4" \
lua54cpath="/usr/lib/lua/5.4" \
lua54path="/usr/lib/lua/5.4"
LUA_INSTALL_DIR:=/usr/lib/lua/5.4
endif
define Package/cqueues/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/_cqueues.so $(1)/usr/lib/lua/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/cqueues.lua $(1)/usr/lib/lua/
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/_cqueues.so $(1)$(LUA_INSTALL_DIR)/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/cqueues.lua $(1)$(LUA_INSTALL_DIR)/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/cqueues $(1)/usr/lib/lua/
endef
define Package/cqueues-lua5.3/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/_cqueues.so $(1)/usr/local/lib/lua/5.3
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/cqueues.lua $(1)/usr/local/lib/lua/5.3
$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/cqueues $(1)/usr/local/lib/lua/5.3
endef
define Package/cqueues-lua5.4/install
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/_cqueues.so $(1)/usr/lib/lua/5.4
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/cqueues.lua $(1)/usr/lib/lua/5.4
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/cqueues $(1)/usr/lib/lua/5.4
$(CP) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/cqueues $(1)$(LUA_INSTALL_DIR)/
endef
Package/cqueues-lua5.3/install = $(Package/cqueues/install)
Package/cqueues-lua5.4/install = $(Package/cqueues/install)
$(eval $(call BuildPackage,cqueues))
$(eval $(call BuildPackage,cqueues-lua5.3))
lang/lua/lua-ffi/Makefile
+7 -12
View File
@@ -54,30 +54,25 @@ Package/lua-ffi-lua5.4/description = $(Package/lua-ffi/default/description)
ifeq ($(BUILD_VARIANT),lua51)
CMAKE_OPTIONS += -DLUA_INCLUDE_DIR="$(STAGING_DIR)/usr/include"
LUA_INSTALL_DIR:=/usr/lib/lua
endif
ifeq ($(BUILD_VARIANT),lua53)
CMAKE_OPTIONS += -DLUA_INCLUDE_DIR="$(STAGING_DIR)/usr/include/lua5.3"
LUA_INSTALL_DIR:=/usr/local/lib/lua/5.3
endif
ifeq ($(BUILD_VARIANT),lua54)
CMAKE_OPTIONS += -DLUA_INCLUDE_DIR="$(STAGING_DIR)/usr/include/lua5.4"
LUA_INSTALL_DIR:=/usr/lib/lua/5.4
endif
define Package/lua-ffi/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ffi.so $(1)/usr/lib/lua
endef
define Package/lua-ffi-lua5.3/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ffi.so $(1)/usr/local/lib/lua/5.3
endef
define Package/lua-ffi-lua5.4/install
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ffi.so $(1)/usr/lib/lua/5.4
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ffi.so $(1)$(LUA_INSTALL_DIR)
endef
Package/lua-ffi-lua5.3/install = $(Package/lua-ffi/install)
Package/lua-ffi-lua5.4/install = $(Package/lua-ffi/install)
$(eval $(call BuildPackage,lua-ffi))
$(eval $(call BuildPackage,lua-ffi-lua5.3))
lang/lua/luaossl/Makefile
+9 -18
View File
@@ -69,6 +69,7 @@ ifeq ($(BUILD_VARIANT),lua51)
LUA51_CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
lua51cpath="/usr/lib/lua" \
lua51path="/usr/lib/lua"
LUA_INSTALL_DIR:=/usr/lib/lua
endif
ifeq ($(BUILD_VARIANT),lua53)
MAKE_FLAGS += \
@@ -76,6 +77,7 @@ ifeq ($(BUILD_VARIANT),lua53)
LUA53_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.3" \
lua53cpath="/usr/local/lib/lua/5.3" \
lua53path="/usr/local/lib/lua/5.3"
LUA_INSTALL_DIR:=/usr/local/lib/lua/5.3
endif
ifeq ($(BUILD_VARIANT),lua54)
MAKE_FLAGS += \
@@ -83,29 +85,18 @@ ifeq ($(BUILD_VARIANT),lua54)
LUA54_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.4" \
lua54cpath="/usr/lib/lua/5.4" \
lua54path="/usr/lib/lua/5.4"
LUA_INSTALL_DIR:=/usr/lib/lua/5.4
endif
define Package/luaossl/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/_openssl.so $(1)/usr/lib/lua/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/openssl.lua $(1)/usr/lib/lua/
$(INSTALL_DIR) $(1)$(LUA_INSTALL_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/_openssl.so $(1)$(LUA_INSTALL_DIR)/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/openssl.lua $(1)$(LUA_INSTALL_DIR)/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/openssl $(1)/usr/lib/lua/
endef
define Package/luaossl-lua5.3/install
$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/_openssl.so $(1)/usr/local/lib/lua/5.3/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/openssl.lua $(1)/usr/local/lib/lua/5.3/
$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.3/openssl $(1)/usr/local/lib/lua/5.3/
endef
define Package/luaossl-lua5.4/install
$(INSTALL_DIR) $(1)/usr/lib/lua/5.4
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/_openssl.so $(1)/usr/lib/lua/5.4/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/openssl.lua $(1)/usr/lib/lua/5.4/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/openssl $(1)/usr/lib/lua/5.4/
$(CP) $(PKG_INSTALL_DIR)$(LUA_INSTALL_DIR)/openssl $(1)$(LUA_INSTALL_DIR)/
endef
Package/luaossl-lua5.3/install = $(Package/luaossl/install)
Package/luaossl-lua5.4/install = $(Package/luaossl/install)
$(eval $(call BuildPackage,luaossl))
$(eval $(call BuildPackage,luaossl-lua5.3))