diff --git a/src/luajit-stamp/download-luajit.cmake b/src/luajit-stamp/download-luajit.cmake index 6504eba7c..83bbaab75 100644 --- a/src/luajit-stamp/download-luajit.cmake +++ b/src/luajit-stamp/download-luajit.cmake @@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good) set("${has_hash}" TRUE PARENT_SCOPE) message(VERBOSE "verifying file... - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz'") + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz'") - file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz" actual_value) + file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz" actual_value) - if(NOT "${actual_value}" STREQUAL "e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4") + if(NOT "${actual_value}" STREQUAL "cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7") set("${hash_is_good}" FALSE PARENT_SCOPE) message(VERBOSE "SHA256 hash of - /home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz + /home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz does not match expected value - expected: 'e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4' + expected: 'cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7' actual: '${actual_value}'") else() set("${hash_is_good}" TRUE PARENT_SCOPE) @@ -71,32 +71,32 @@ function(sleep_before_download attempt) execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}") endfunction() -if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz") +if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz") check_file_hash(has_hash hash_is_good) if(has_hash) if(hash_is_good) message(VERBOSE "File already exists and hash match (skip download): - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz' - SHA256='e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4'" + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz' + SHA256='cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7'" ) return() else() message(VERBOSE "File already exists but hash mismatch. Removing...") - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz") endif() else() message(VERBOSE "File already exists but no hash specified (use URL_HASH): - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz' + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz' Old file will be removed and new file downloaded from URL." ) - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz") endif() endif() set(retry_number 5) message(VERBOSE "Downloading... - dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz' + dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz' timeout='none' inactivity timeout='none'" ) @@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number}) if(status_code IN_LIST download_retry_codes) sleep_before_download(${i}) endif() - foreach(url IN ITEMS [====[https://github.com/LuaJIT/LuaJIT/archive/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz]====]) + foreach(url IN ITEMS [====[https://github.com/LuaJIT/LuaJIT/archive/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz]====]) if(NOT url IN_LIST skip_url_list) message(VERBOSE "Using src='${url}'") @@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number}) file( DOWNLOAD - "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz" + "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz" # no TIMEOUT # no INACTIVITY_TIMEOUT @@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number}) check_file_hash(has_hash hash_is_good) if(has_hash AND NOT hash_is_good) message(VERBOSE "Hash mismatch, removing...") - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz") else() message(VERBOSE "Downloading... done") return() diff --git a/src/luajit-stamp/extract-luajit.cmake b/src/luajit-stamp/extract-luajit.cmake index a3003021f..f6131c288 100644 --- a/src/luajit-stamp/extract-luajit.cmake +++ b/src/luajit-stamp/extract-luajit.cmake @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5) # Make file names absolute: # -get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz" ABSOLUTE) +get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz" ABSOLUTE) get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/luajit" ABSOLUTE) message(VERBOSE "extracting... diff --git a/src/luajit-stamp/luajit-urlinfo.txt b/src/luajit-stamp/luajit-urlinfo.txt index 28e0ff76b..8c93085d0 100644 --- a/src/luajit-stamp/luajit-urlinfo.txt +++ b/src/luajit-stamp/luajit-urlinfo.txt @@ -6,7 +6,7 @@ method=url command=/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/download-luajit.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/verify-luajit.cmake;COMMAND;/usr/local/bin/cmake;-DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/extract-luajit.cmake source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/luajit work_dir=/home/runner/work/deps/deps/neovim/deps/build/src -url(s)=https://github.com/LuaJIT/LuaJIT/archive/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz -hash=SHA256=e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4 +url(s)=https://github.com/LuaJIT/LuaJIT/archive/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz +hash=SHA256=cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7 no_extract= diff --git a/src/luajit/.relver b/src/luajit/.relver index 9848b19d2..e997a3642 100644 --- a/src/luajit/.relver +++ b/src/luajit/.relver @@ -1 +1 @@ -1727827585 +1727870382 diff --git a/src/luajit/src/Makefile b/src/luajit/src/Makefile index 43238912a..99642be7b 100644 --- a/src/luajit/src/Makefile +++ b/src/luajit/src/Makefile @@ -323,13 +323,13 @@ ifeq (Darwin,$(TARGET_SYS)) endif TARGET_STRIP+= -x TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL - TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC TARGET_DYNXLDOPTS= TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255 else ifeq (iOS,$(TARGET_SYS)) TARGET_STRIP+= -x - TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC + TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC TARGET_DYNXLDOPTS= TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255 ifeq (arm64,$(TARGET_LJARCH)) diff --git a/src/luajit/src/host/buildvm_asm.c b/src/luajit/src/host/buildvm_asm.c index e7c5de708..1b261206a 100644 --- a/src/luajit/src/host/buildvm_asm.c +++ b/src/luajit/src/host/buildvm_asm.c @@ -339,6 +339,10 @@ void emit_asm(BuildCtx *ctx) fprintf(ctx->fp, "\t.ident \"%s\"\n", ctx->dasm_ident); break; case BUILD_machasm: +#if defined(__apple_build_version__) && __apple_build_version__ >= 15000000 && __apple_build_version__ < 15000300 + /* Workaround for XCode 15.0 - 15.2. */ + fprintf(ctx->fp, "\t.subsections_via_symbols\n"); +#endif fprintf(ctx->fp, "\t.cstring\n" "\t.ascii \"%s\\0\"\n", ctx->dasm_ident);