Skip to content

Commit 59193b2

Browse files
marvimmarvim
committed
deps src: Automatic update
1 parent 9a1f701 commit 59193b2

File tree

6 files changed

+25
-21
lines changed

6 files changed

+25
-21
lines changed

‎src/luajit-stamp/download-luajit.cmake

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good)
2222
set("${has_hash}" TRUE PARENT_SCOPE)
2323

2424
message(VERBOSE "verifying file...
25-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz'")
25+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz'")
2626

27-
file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz" actual_value)
27+
file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz" actual_value)
2828

29-
if(NOT "${actual_value}" STREQUAL "e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4")
29+
if(NOT "${actual_value}" STREQUAL "cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7")
3030
set("${hash_is_good}" FALSE PARENT_SCOPE)
3131
message(VERBOSE "SHA256 hash of
32-
/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz
32+
/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz
3333
does not match expected value
34-
expected: 'e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4'
34+
expected: 'cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7'
3535
actual: '${actual_value}'")
3636
else()
3737
set("${hash_is_good}" TRUE PARENT_SCOPE)
@@ -71,32 +71,32 @@ function(sleep_before_download attempt)
7171
execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}")
7272
endfunction()
7373

74-
if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz")
74+
if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz")
7575
check_file_hash(has_hash hash_is_good)
7676
if(has_hash)
7777
if(hash_is_good)
7878
message(VERBOSE "File already exists and hash match (skip download):
79-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz'
80-
SHA256='e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4'"
79+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz'
80+
SHA256='cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7'"
8181
)
8282
return()
8383
else()
8484
message(VERBOSE "File already exists but hash mismatch. Removing...")
85-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz")
85+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz")
8686
endif()
8787
else()
8888
message(VERBOSE "File already exists but no hash specified (use URL_HASH):
89-
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz'
89+
file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz'
9090
Old file will be removed and new file downloaded from URL."
9191
)
92-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz")
92+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz")
9393
endif()
9494
endif()
9595

9696
set(retry_number 5)
9797

9898
message(VERBOSE "Downloading...
99-
dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz'
99+
dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz'
100100
timeout='none'
101101
inactivity timeout='none'"
102102
)
@@ -107,7 +107,7 @@ foreach(i RANGE ${retry_number})
107107
if(status_code IN_LIST download_retry_codes)
108108
sleep_before_download(${i})
109109
endif()
110-
foreach(url IN ITEMS [====[https://github.com/LuaJIT/LuaJIT/archive/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz]====])
110+
foreach(url IN ITEMS [====[https://github.com/LuaJIT/LuaJIT/archive/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz]====])
111111
if(NOT url IN_LIST skip_url_list)
112112
message(VERBOSE "Using src='${url}'")
113113

@@ -119,7 +119,7 @@ foreach(i RANGE ${retry_number})
119119

120120
file(
121121
DOWNLOAD
122-
"${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz"
122+
"${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz"
123123

124124
# no TIMEOUT
125125
# no INACTIVITY_TIMEOUT
@@ -136,7 +136,7 @@ foreach(i RANGE ${retry_number})
136136
check_file_hash(has_hash hash_is_good)
137137
if(has_hash AND NOT hash_is_good)
138138
message(VERBOSE "Hash mismatch, removing...")
139-
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz")
139+
file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz")
140140
else()
141141
message(VERBOSE "Downloading... done")
142142
return()

‎src/luajit-stamp/extract-luajit.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5)
55

66
# Make file names absolute:
77
#
8-
get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz" ABSOLUTE)
8+
get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz" ABSOLUTE)
99
get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/luajit" ABSOLUTE)
1010

1111
message(VERBOSE "extracting...

‎src/luajit-stamp/luajit-urlinfo.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ method=url
66
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
77
source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/luajit
88
work_dir=/home/runner/work/deps/deps/neovim/deps/build/src
9-
url(s)=https://github.com/LuaJIT/LuaJIT/archive/2240d84464cc3dcb22fd976f1db162b36b5b52d5.tar.gz
10-
hash=SHA256=e0f47741fdc37f30298b33abe64bad7653e12a7438ee9f2186058a1cc0cfdae4
9+
url(s)=https://github.com/LuaJIT/LuaJIT/archive/97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz
10+
hash=SHA256=cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7
1111
no_extract=
1212

‎src/luajit/.relver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1727827585
1+
1727870382

‎src/luajit/src/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,13 @@ ifeq (Darwin,$(TARGET_SYS))
323323
endif
324324
TARGET_STRIP+= -x
325325
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
326-
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
326+
TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC
327327
TARGET_DYNXLDOPTS=
328328
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
329329
else
330330
ifeq (iOS,$(TARGET_SYS))
331331
TARGET_STRIP+= -x
332-
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
332+
TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC
333333
TARGET_DYNXLDOPTS=
334334
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
335335
ifeq (arm64,$(TARGET_LJARCH))

‎src/luajit/src/host/buildvm_asm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,10 @@ void emit_asm(BuildCtx *ctx)
339339
fprintf(ctx->fp, "\t.ident \"%s\"\n", ctx->dasm_ident);
340340
break;
341341
case BUILD_machasm:
342+
#if defined(__apple_build_version__) && __apple_build_version__ >= 15000000 && __apple_build_version__ < 15000300
343+
/* Workaround for XCode 15.0 - 15.2. */
344+
fprintf(ctx->fp, "\t.subsections_via_symbols\n");
345+
#endif
342346
fprintf(ctx->fp,
343347
"\t.cstring\n"
344348
"\t.ascii \"%s\\0\"\n", ctx->dasm_ident);

0 commit comments

Comments
 (0)