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

luaossl: fix Lua 5.4 module installation paths

Browse Source 
Commit 3fe92e63f5 moved the default Lua 5.4 module search paths
from /usr/local to /usr. luaossl still staged and packaged its Lua 5.4
modules under /usr/local/lib/lua/5.4, outside the default search paths.

Set lua54path and lua54cpath to /usr/lib/lua/5.4 and update the package
install rules to match. Bump PKG_RELEASE to 3 so the corrected package
is offered as an upgrade. Keep Lua 5.1 and Lua 5.3 paths unchanged.

Fixes: 3fe92e63f5 ("lua: look for lua5.4 modules under /usr instead of /usr/local")
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao authored and Alexandru Ardelean committed 2026-10-05 12:01:29 +03:00
1 parent 76ed3f94ad
commit 3f87f7ae83
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
lang/lua/luaossl/Makefile
+7 -7
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luaossl
PKG_VERSION:=20220711
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_MAINTAINER:=Siger Yang <siger.yang@outlook.com>
PKG_MIRROR_HASH:=7abb1070da36906f9ef310af1a12827543bb5de4bbe239068420fd8b3e3858d2
@@ -81,8 +81,8 @@ ifeq ($(BUILD_VARIANT),lua54)
MAKE_FLAGS += \
LUA_APIS="5.4" \
LUA54_CPPFLAGS="-I$(STAGING_DIR)/usr/include/lua5.4" \
lua54cpath="/usr/local/lib/lua/5.4" \
lua54path="/usr/local/lib/lua/5.4"
lua54cpath="/usr/lib/lua/5.4" \
lua54path="/usr/lib/lua/5.4"
endif
define Package/luaossl/install
@@ -100,11 +100,11 @@ define Package/luaossl-lua5.3/install
$(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/local/lib/lua/5.4
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/_openssl.so $(1)/usr/local/lib/lua/5.4/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/lua/5.4/openssl.lua $(1)/usr/local/lib/lua/5.4/
$(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/local/lib/lua/5.4/openssl $(1)/usr/local/lib/lua/5.4/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/5.4/openssl $(1)/usr/lib/lua/5.4/
endef
$(eval $(call BuildPackage,luaossl))