early-access version 2853
This commit is contained in:
pineappleEA
119
externals/vcpkg/ports/luajit/001-fix-build-path.patch
vendored
Executable file
119
externals/vcpkg/ports/luajit/001-fix-build-path.patch
vendored
Executable file
@@ -0,0 +1,119 @@
|
||||
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
|
||||
index 42e3652..6a889e1 100644
|
||||
--- a/src/msvcbuild.bat
|
||||
+++ b/src/msvcbuild.bat
|
||||
@@ -14,17 +14,18 @@
|
||||
@if not defined INCLUDE goto :FAIL
|
||||
|
||||
@setlocal
|
||||
-@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%
|
||||
@set LJLINK=link /nologo
|
||||
@set LJMT=mt /nologo
|
||||
@set LJLIB=lib /nologo /nodefaultlib
|
||||
-@set DASMDIR=..\dynasm
|
||||
+@set DASMDIR=%SOURCEDIR%\..\dynasm
|
||||
@set DASM=%DASMDIR%\dynasm.lua
|
||||
@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 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
|
||||
+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb
|
||||
@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
|
||||
@if errorlevel 1 goto :BAD
|
||||
|
||||
-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c
|
||||
+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb
|
||||
@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^
|
||||
|
||||
buildvm -m peobj -o lj_vm.obj
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%
|
||||
+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB%
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%
|
||||
+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB%
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m libdef -o lj_libdef.h %ALL_LIB%
|
||||
+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB%
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m recdef -o lj_recdef.h %ALL_LIB%
|
||||
+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB%
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
|
||||
+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%
|
||||
@if errorlevel 1 goto :BAD
|
||||
-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
|
||||
+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c
|
||||
@if errorlevel 1 goto :BAD
|
||||
|
||||
-@if "%1" neq "debug" goto :NODEBUG
|
||||
+@set LJLINK=%LJLINK% /debug
|
||||
+@if "%2" neq "debug" goto :NODEBUG
|
||||
@shift
|
||||
@set LJCOMPILE=%LJCOMPILE% /Zi
|
||||
-@set LJLINK=%LJLINK% /debug
|
||||
:NODEBUG
|
||||
-@if "%1"=="amalg" goto :AMALGDLL
|
||||
-@if "%1"=="static" goto :STATIC
|
||||
-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c
|
||||
+@if "%2"=="amalg" goto :AMALGDLL
|
||||
+@if "%2"=="static" goto :STATIC
|
||||
+%LJCOMPILE% /MD /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
|
||||
@if errorlevel 1 goto :BAD
|
||||
@goto :MTDLL
|
||||
:STATIC
|
||||
-%LJCOMPILE% lj_*.c lib_*.c
|
||||
+%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
|
||||
@if errorlevel 1 goto :BAD
|
||||
%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
|
||||
@if errorlevel 1 goto :BAD
|
||||
@goto :MTDLL
|
||||
:AMALGDLL
|
||||
-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c
|
||||
+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c
|
||||
@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
|
||||
if exist %LJDLLNAME%.manifest^
|
||||
%LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
|
||||
|
||||
-%LJCOMPILE% luajit.c
|
||||
+%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
|
||||
@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^
|
||||
%LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe
|
||||
|
||||
@del *.obj *.manifest minilua.exe buildvm.exe
|
||||
-@del host\buildvm_arch.h
|
||||
-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
|
||||
+@del %SOURCEDIR%\host\buildvm_arch.h
|
||||
+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h
|
||||
@echo.
|
||||
@echo === Successfully built LuaJIT for Windows/%LJARCH% ===
|
||||
|
||||
@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^
|
||||
@goto :END
|
||||
:FAIL
|
||||
@echo You must open a "Visual Studio .NET Command Prompt" to run this script
|
||||
+exit 1
|
||||
:END
|
||||
42
externals/vcpkg/ports/luajit/002-fix-crt-linkage.patch
vendored
Executable file
42
externals/vcpkg/ports/luajit/002-fix-crt-linkage.patch
vendored
Executable file
@@ -0,0 +1,42 @@
|
||||
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
|
||||
index 6a889e1..08c4e3c 100644
|
||||
--- a/src/msvcbuild.bat
|
||||
+++ b/src/msvcbuild.bat
|
||||
@@ -64,20 +64,23 @@ 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
|
||||
|
||||
+@if "%2"=="static" set CRT_LINKAGE=/MT
|
||||
+@if "%2"=="dynamic" set CRT_LINKAGE=/MD
|
||||
@set LJLINK=%LJLINK% /debug
|
||||
-@if "%2" neq "debug" goto :NODEBUG
|
||||
+@if "%3" neq "debug" goto :NODEBUG
|
||||
@shift
|
||||
@set LJCOMPILE=%LJCOMPILE% /Zi
|
||||
+@set CRT_LINKAGE=%CRT_LINKAGE%d
|
||||
:NODEBUG
|
||||
-@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
|
||||
+%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
|
||||
@if errorlevel 1 goto :BAD
|
||||
@goto :MTDLL
|
||||
:STATIC
|
||||
-%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
|
||||
+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb
|
||||
@if errorlevel 1 goto :BAD
|
||||
%LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj
|
||||
@if errorlevel 1 goto :BAD
|
||||
@@ -94,7 +94,7 @@
|
||||
if exist %LJDLLNAME%.manifest^
|
||||
%LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2
|
||||
|
||||
-%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
|
||||
+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb
|
||||
@if errorlevel 1 goto :BAD
|
||||
%LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%
|
||||
@if errorlevel 1 goto :BAD
|
||||
14
externals/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch
vendored
Executable file
14
externals/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch
vendored
Executable file
@@ -0,0 +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=
|
||||
107
externals/vcpkg/ports/luajit/portfile.cmake
vendored
Executable file
107
externals/vcpkg/ports/luajit/portfile.cmake
vendored
Executable file
@@ -0,0 +1,107 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO LuaJIT/LuaJIT
|
||||
REF v2.0.5
|
||||
SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
001-fix-build-path.patch
|
||||
002-fix-crt-linkage.patch
|
||||
003-do-not-set-macosx-deployment-target.patch
|
||||
)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
set (LJIT_STATIC "")
|
||||
else()
|
||||
set (LJIT_STATIC "static")
|
||||
endif()
|
||||
|
||||
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
|
||||
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
||||
file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
vcpkg_execute_required_process_repeat(
|
||||
COUNT 1
|
||||
COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} debug ${LJIT_STATIC}
|
||||
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
|
||||
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")
|
||||
|
||||
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(
|
||||
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME clean-${TARGET_TRIPLET}-debug
|
||||
)
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME build-${TARGET_TRIPLET}-debug
|
||||
)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-rel")
|
||||
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
||||
file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
vcpkg_execute_required_process_repeat(
|
||||
COUNT 1
|
||||
COMMAND "${SOURCE_PATH}/src/msvcbuild.bat" ${SOURCE_PATH}/src ${VCPKG_CRT_LINKAGE} ${LJIT_STATIC}
|
||||
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
|
||||
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")
|
||||
|
||||
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(
|
||||
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME clean-${TARGET_TRIPLET}-rel
|
||||
)
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME build-${TARGET_TRIPLET}-rel
|
||||
)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/lua" "${CURRENT_PACKAGES_DIR}/lib/lua")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/src/lua.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/src/luajit.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/src/luaconf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/src/lualib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/src/lauxlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/src/lua.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
9
externals/vcpkg/ports/luajit/vcpkg.json
vendored
Executable file
9
externals/vcpkg/ports/luajit/vcpkg.json
vendored
Executable file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"name": "luajit",
|
||||
"version": "2.0.5",
|
||||
"port-version": 8,
|
||||
"description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.",
|
||||
"homepage": "https://github.com/LuaJIT/LuaJIT",
|
||||
"license": "MIT",
|
||||
"supports": "!uwp"
|
||||
}
|
||||
Reference in New Issue
Block a user