mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
lua-openssl: fix Lua detection with CMake 4.3
FindLuaJIT.cmake uses NO_DEFAULT_PATH and only searches hardcoded luajit-specific paths, so it never finds regular Lua. However if LUAJIT_INCLUDE_DIRS and LUAJIT_LIBRARY are pre-set in the CMake cache, find_path/find_library skip their searches, the module sets LUAJIT_FOUND=ON and also sets LUA_INCLUDE_DIR/LUA_LIBRARIES from those values, and the if(NOT LUAJIT_FOUND) guard skips the broken find_package(Lua REQUIRED) call that fails under CMake 4.3. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
committed by
Alexandru Ardelean
parent
5e9229551d
commit
a3d2536eb0
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NAME:=lua-openssl
|
||||
PKG_SOURCE_VERSION:=0.11.1
|
||||
PKG_VERSION:=$(subst -,.,$(PKG_SOURCE_VERSION))
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/zhaozg/lua-openssl.git
|
||||
@@ -24,8 +24,8 @@ include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
CMAKE_OPTIONS += \
|
||||
-DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include \
|
||||
-DLUA_LIBRARY=$(STAGING_DIR)/usr/lib/liblua.so
|
||||
-DLUAJIT_INCLUDE_DIRS=$(STAGING_DIR)/usr/include \
|
||||
-DLUAJIT_LIBRARY=$(STAGING_DIR)/usr/lib/liblua.so
|
||||
|
||||
define Package/lua-openssl
|
||||
SUBMENU:=Lua
|
||||
|
||||
Reference in New Issue
Block a user