From 6c5a3c4d7845fb7e2f49313c4db8abe3439974db Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 5 Oct 2026 12:07:50 +0300 Subject: [PATCH] lua: use LUA_INSTALL_DIR in cqueues, lua-ffi and luaossl 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 --- lang/lua/cqueues/Makefile | 28 +++++++++------------------- lang/lua/lua-ffi/Makefile | 19 +++++++------------ lang/lua/luaossl/Makefile | 27 +++++++++------------------ 3 files changed, 25 insertions(+), 49 deletions(-) diff --git a/lang/lua/cqueues/Makefile b/lang/lua/cqueues/Makefile index fd562c9b33..2672432417 100644 --- a/lang/lua/cqueues/Makefile +++ b/lang/lua/cqueues/Makefile @@ -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)) diff --git a/lang/lua/lua-ffi/Makefile b/lang/lua/lua-ffi/Makefile index 3b9e83c084..b2778741fd 100644 --- a/lang/lua/lua-ffi/Makefile +++ b/lang/lua/lua-ffi/Makefile @@ -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)) diff --git a/lang/lua/luaossl/Makefile b/lang/lua/luaossl/Makefile index 2b62b29ad2..809666050c 100644 --- a/lang/lua/luaossl/Makefile +++ b/lang/lua/luaossl/Makefile @@ -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))