Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump/luajit #670

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Bump/luajit #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dca7984
build: update cmake_minimum_required to 3.5
zhaozg Aug 23, 2023
811a15d
fixup .ci/setup_lua.sh for LuaJIT rolling releases.
zhaozg Aug 23, 2023
9122509
bump LuaJIT to HEAD of v2.1
zhaozg Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .ci/setup_lua.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ if [ "$LUAJIT" == "yes" ]; then

if [ "$LUA" == "luajit2.1" ]; then
git checkout v2.1;
# force the INSTALL_TNAME to be luajit
perl -i -pe 's/INSTALL_TNAME=.+/INSTALL_TNAME= luajit/' Makefile
fi

make && make install PREFIX="$LUA_HOME_DIR"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.5)

if(POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) # faster evaluation of variable references
Expand Down
2 changes: 1 addition & 1 deletion deps/luajit
Open in desktop
Submodule luajit updated 219 files
18 changes: 17 additions & 1 deletion deps/luajit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,25 @@ if(MINILUA_USE_LIBM)
TARGET_LINK_LIBRARIES(minilua m)
endif()

set(GIT_FORMAT %ct)
if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
set(GIT_FORMAT %%ct)
endif()
add_custom_command(OUTPUT ${LUAJIT_DIR}/src/luajit_relver.txt
COMMAND git show -s --format=${GIT_FORMAT} > ${LUAJIT_DIR}/src/luajit_relver.txt
WORKING_DIRECTORY ${LUAJIT_DIR}
)

add_custom_command(OUTPUT ${LUAJIT_DIR}/src/luajit.h
COMMAND minilua host/genversion.lua
WORKING_DIRECTORY ${LUAJIT_DIR}/src
DEPENDS ${LUAJIT_DIR}/src/luajit_rolling.h
DEPENDS ${LUAJIT_DIR}/src/luajit_relver.txt
)

add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/buildvm_arch.h
COMMAND minilua ${LUAJIT_DIR}/dynasm/dynasm.lua ${DASM_FLAGS} -o ${CMAKE_CURRENT_BINARY_DIR}/buildvm_arch.h ${LUAJIT_DIR}/src/vm_${DASM_ARCH}.dasc
DEPENDS ${LUAJIT_DIR}/dynasm/dynasm.lua minilua
DEPENDS ${LUAJIT_DIR}/dynasm/dynasm.lua minilua ${LUAJIT_DIR}/src/luajit.h
)

## Source Lists
Expand Down
Loading