[luajit] update to the latest commit (#25856)

* update version * update version * [luajit] update to latest commit * update version * add patch * update version
2024-11-28 04:19:00 +08:00 · 2022-08-12 09:17:20 +08:00 · 2022-08-12 09:17:20 +08:00 · 2c7862c4aa
commit 2c7862c4aa
parent 79211d3e4a
7 changed files with 54 additions and 56 deletions
--- a/ports/luajit/001-fix-build-path.patch
+++ b/ports/luajit/001-fix-build-path.patch
@ -1,11 +1,11 @@
 diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
-index 42e3652..6a889e1 100644
+index aab4ef1..ff9df57 100644
 --- a/src/msvcbuild.bat
 +++ b/src/msvcbuild.bat
-@@ -14,17 +14,18 @@
- @if not defined INCLUDE goto :FAIL
- 
+@@ -15,19 +15,20 @@
 @setlocal
+ @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
+ @set DEBUGCFLAGS=
 -@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
 +@set SOURCEDIR=%1
 +@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR%
@ -15,9 +15,11 @@ index 42e3652..6a889e1 100644
 -@set DASMDIR=..\dynasm
 +@set DASMDIR=%SOURCEDIR%\..\dynasm
 @set DASM=%DASMDIR%\dynasm.lua
+ @set DASC=vm_x64.dasc
 @set LJDLLNAME=lua51.dll
 @set LJLIBNAME=lua51.lib
-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
+ @set BUILDTYPE=release
+-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c
 +@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c
 
 -%LJCOMPILE% host\minilua.c
@ -25,12 +27,8 @@ index 42e3652..6a889e1 100644
 @if errorlevel 1 goto :BAD
 %LJLINK% /out:minilua.exe minilua.obj
 @if errorlevel 1 goto :BAD
-@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^
- @set DASMFLAGS=-D WIN -D JIT -D FFI
- @set LJARCH=x86
- :X64
-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc
-+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc
+@@ -51,7 +52,7 @@ if exist minilua.exe.manifest^
+ minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC%
 @if errorlevel 1 goto :BAD
 
 -%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
@ -38,7 +36,7 @@ index 42e3652..6a889e1 100644
 @if errorlevel 1 goto :BAD
 %LJLINK% /out:buildvm.exe buildvm*.obj
 @if errorlevel 1 goto :BAD
-@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^
+@@ -60,41 +61,41 @@ if exist buildvm.exe.manifest^
 
 buildvm -m peobj -o lj_vm.obj
 @if errorlevel 1 goto :BAD
@ -65,9 +63,11 @@ index 42e3652..6a889e1 100644
 +@set LJLINK=%LJLINK% /debug
 +@if "%2" neq "debug" goto :NODEBUG
 @shift
- @set LJCOMPILE=%LJCOMPILE% /Zi
-@set LJLINK=%LJLINK% /debug
+ @set BUILDTYPE=debug
+ @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
+-@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no
 :NODEBUG
+ @set LJLINK=%LJLINK% /%BUILDTYPE%
 -@if "%1"=="amalg" goto :AMALGDLL
 -@if "%1"=="static" goto :STATIC
 -%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
@ -91,7 +91,7 @@ index 42e3652..6a889e1 100644
 @if errorlevel 1 goto :BAD
 %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj
 @if errorlevel 1 goto :BAD
-@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
+@@ -102,7 +103,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 if exist %LJDLLNAME%.manifest^
   %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
 
@ -100,7 +100,7 @@ index 42e3652..6a889e1 100644
 @if errorlevel 1 goto :BAD
 %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
 @if errorlevel 1 goto :BAD
-@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^
+@@ -110,8 +111,8 @@ if exist luajit.exe.manifest^
   %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
 
 @del *.obj *.manifest minilua.exe buildvm.exe
@ -111,9 +111,9 @@ index 42e3652..6a889e1 100644
 @echo.
 @echo === Successfully built LuaJIT for Windows/%LJARCH% ===
 
-@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^
+@@ -124,4 +125,5 @@ if exist luajit.exe.manifest^
 @goto :END
 :FAIL
- @echo You must open a "Visual Studio .NET Command Prompt" to run this script
+ @echo You must open a "Visual Studio Command Prompt" to run this script
 +exit 1
 :END
--- a/ports/luajit/002-fix-crt-linkage.patch
+++ b/ports/luajit/002-fix-crt-linkage.patch
@ -1,8 +1,8 @@
 diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
-index 6a889e1..08c4e3c 100644
+index ff9df57..912bdc9 100644
 --- a/src/msvcbuild.bat
 +++ b/src/msvcbuild.bat
-@@ -64,20 +64,23 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
+@@ -74,22 +74,25 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
 buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
 @if errorlevel 1 goto :BAD
 
@ -12,14 +12,16 @@ index 6a889e1..08c4e3c 100644
 -@if "%2" neq "debug" goto :NODEBUG
 +@if "%3" neq "debug" goto :NODEBUG
 @shift
- @set LJCOMPILE=%LJCOMPILE% /Zi
+ @set BUILDTYPE=debug
+ @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%
 +@set CRT_LINKAGE=%CRT_LINKAGE%d
 :NODEBUG
+ @set LJLINK=%LJLINK% /%BUILDTYPE%
 -@if "%2"=="amalg" goto :AMALGDLL
-+@if "%3"=="amalg" goto :AMALGDLL
 -@if "%2"=="static" goto :STATIC
-+@if "%3"=="static" goto :STATIC
 -%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
+@if "%3"=="amalg" goto :AMALGDLL
+@if "%3"=="static" goto :STATIC
 +%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
 @if errorlevel 1 goto :BAD
 %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj
@ -31,7 +33,7 @@ index 6a889e1..08c4e3c 100644
 @if errorlevel 1 goto :BAD
 %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
 @if errorlevel 1 goto :BAD
-@@ -94,7 +94,7 @@
+@@ -103,7 +106,7 @@ buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
 if exist %LJDLLNAME%.manifest^
   %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
 
--- a/ports/luajit/003-do-not-set-macosx-deployment-target.patch
+++ b/ports/luajit/003-do-not-set-macosx-deployment-target.patch
@ -1,14 +1,14 @@
-diff --git a/src/Makefile b/src/Makefile
-index f7f81a4..e6140c4 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
-   TARGET_XCFLAGS+= -fno-stack-protector
- endif
- ifeq (Darwin,$(TARGET_SYS))
-  ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
-    export MACOSX_DEPLOYMENT_TARGET=10.4
-  endif
-   TARGET_STRIP+= -x
-   TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
-   TARGET_DYNXLDOPTS=
+diff --git a/src/Makefile b/src/Makefile
+index 30d64be..b753ea1 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -316,9 +316,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector
+   TARGET_XCFLAGS+= -fno-stack-protector
+ endif
+ ifeq (Darwin,$(TARGET_SYS))
+-  ifeq (,$(MACOSX_DEPLOYMENT_TARGET))
+-    $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY)
+-  endif
+   TARGET_STRIP+= -x
+   TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
+   TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
--- a/ports/luajit/portfile.cmake
+++ b/ports/luajit/portfile.cmake
@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO LuaJIT/LuaJIT
-    REF v2.0.5
-    SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576
+    REF 633f265f67f322cbe2c5fd11d3e46d968ac220f7  #2022-08-11
+    SHA512 0a1d79ab7d2de6894bcff33309e015fdba0ea67cf0425d75b9301a30006039e81b527178dbb3485e1adea177ffe062e6fcef74307f8e725678e70562d57d1a5b
    HEAD_REF master
    PATCHES
        001-fix-build-path.patch
@ -29,13 +29,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
            LOGNAME build-${TARGET_TRIPLET}-dbg
        )

-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")

-        if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-            file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools")
-        endif()
        vcpkg_copy_pdbs()
    else()
        vcpkg_execute_build_process(
@ -68,13 +64,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
            LOGNAME build-${TARGET_TRIPLET}-rel
        )

-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
-        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")
+        file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")

-        if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-            file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-            vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools)
-        endif()
        vcpkg_copy_pdbs()
    else()
        vcpkg_execute_build_process(
--- a/ports/luajit/vcpkg.json
+++ b/ports/luajit/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "luajit",
-  "version": "2.0.5",
-  "port-version": 8,
+  "version-date": "2022-08-11",
  "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.",
  "homepage": "https://github.com/LuaJIT/LuaJIT",
  "license": "MIT",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -4397,8 +4397,8 @@
      "port-version": 2
    },
    "luajit": {
-      "baseline": "2.0.5",
-      "port-version": 8
+      "baseline": "2022-08-11",
+      "port-version": 0
    },
    "luasec": {
      "baseline": "1.1.0",
--- a/versions/l-/luajit.json
+++ b/versions/l-/luajit.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4c2d21d9bf0e5cedc0f7540a7e473c2e86f2c5ef",
+      "version-date": "2022-08-11",
+      "port-version": 0
+    },
    {
      "git-tree": "9b560fe2d3810733d0b0f69b2a91093b02ac49b6",
      "version": "2.0.5",