From 890ab42bb5458cea914741768ee9344fcc8f94db Mon Sep 17 00:00:00 2001 From: "Oleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco)" Date: Tue, 29 Apr 2025 11:56:25 +0000 Subject: [PATCH] Pull request #4717: Fix build for newer LuaJIT Merge in SNORT/snort3 from ~OSHUMEIK/snort3:build_fix to master Squashed commit of the following: commit 7fa3b137336f512a60351e5462050e09d3931897 Author: Oleksii Shumeiko Date: Tue Apr 29 10:34:02 2025 +0300 build: apply workaround only for lower versions of LuaJIT Thanks to Michael Cho for reporting the issue. --- cmake/FindLuaJIT.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake index 251a258b7..a2d4ad043 100644 --- a/cmake/FindLuaJIT.cmake +++ b/cmake/FindLuaJIT.cmake @@ -27,10 +27,6 @@ else() HINTS ${LUAJIT_LIBRARIES_DIR_HINT} ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}) endif() -if (APPLE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LUAJIT_LIBRARIES} -pagezero_size 10000 -image_base 100000000") -endif() - if(LUAJIT_INCLUDE_DIR AND EXISTS "${LUAJIT_INCLUDE_DIR}/luajit.h") file(STRINGS "${LUAJIT_INCLUDE_DIR}/luajit.h" luajit_version_str REGEX "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT .+\"") @@ -47,5 +43,13 @@ find_package_handle_standard_args(LuaJIT FAIL_MESSAGE "${ERROR_MESSAGE}" ) +if (APPLE) + if(LUAJIT_VERSION_STRING VERSION_LESS "2.1") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LUAJIT_LIBRARIES} -pagezero_size 10000 -image_base 100000000") + else() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LUAJIT_LIBRARIES}") + endif() +endif() + mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES) -- 2.47.3