]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/luajit/001-fix-build-path.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / luajit / 001-fix-build-path.patch
CommitLineData
1e59de90
TL
1diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat\r
2index 42e3652..6a889e1 100644\r
3--- a/src/msvcbuild.bat\r
4+++ b/src/msvcbuild.bat\r
5@@ -14,17 +14,18 @@\r
6 @if not defined INCLUDE goto :FAIL\r
7 \r
8 @setlocal\r
9-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline\r
10+@set SOURCEDIR=%1\r
11+@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR%\r
12 @set LJLINK=link /nologo\r
13 @set LJMT=mt /nologo\r
14 @set LJLIB=lib /nologo /nodefaultlib\r
15-@set DASMDIR=..\dynasm\r
16+@set DASMDIR=%SOURCEDIR%\..\dynasm\r
17 @set DASM=%DASMDIR%\dynasm.lua\r
18 @set LJDLLNAME=lua51.dll\r
19 @set LJLIBNAME=lua51.lib\r
20-@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\r
21+@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\r
22 \r
23-%LJCOMPILE% host\minilua.c\r
24+%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb\r
25 @if errorlevel 1 goto :BAD\r
26 %LJLINK% /out:minilua.exe minilua.obj\r
27 @if errorlevel 1 goto :BAD\r
28@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^\r
29 @set DASMFLAGS=-D WIN -D JIT -D FFI\r
30 @set LJARCH=x86\r
31 :X64\r
32-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc\r
33+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc\r
34 @if errorlevel 1 goto :BAD\r
35 \r
36-%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c\r
37+%LJCOMPILE% /I "." /I %DASMDIR% %SOURCEDIR%\host\buildvm*.c /Fdbuildvm.pdb\r
38 @if errorlevel 1 goto :BAD\r
39 %LJLINK% /out:buildvm.exe buildvm*.obj\r
40 @if errorlevel 1 goto :BAD\r
41@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^\r
42 \r
43 buildvm -m peobj -o lj_vm.obj\r
44 @if errorlevel 1 goto :BAD\r
45-buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%\r
46+buildvm -m bcdef -o %SOURCEDIR%\lj_bcdef.h %ALL_LIB%\r
47 @if errorlevel 1 goto :BAD\r
48-buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%\r
49+buildvm -m ffdef -o %SOURCEDIR%\lj_ffdef.h %ALL_LIB%\r
50 @if errorlevel 1 goto :BAD\r
51-buildvm -m libdef -o lj_libdef.h %ALL_LIB%\r
52+buildvm -m libdef -o %SOURCEDIR%\lj_libdef.h %ALL_LIB%\r
53 @if errorlevel 1 goto :BAD\r
54-buildvm -m recdef -o lj_recdef.h %ALL_LIB%\r
55+buildvm -m recdef -o %SOURCEDIR%\lj_recdef.h %ALL_LIB%\r
56 @if errorlevel 1 goto :BAD\r
57-buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%\r
58+buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB%\r
59 @if errorlevel 1 goto :BAD\r
60-buildvm -m folddef -o lj_folddef.h lj_opt_fold.c\r
61+buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c\r
62 @if errorlevel 1 goto :BAD\r
63 \r
64-@if "%1" neq "debug" goto :NODEBUG\r
65+@set LJLINK=%LJLINK% /debug\r
66+@if "%2" neq "debug" goto :NODEBUG\r
67 @shift\r
68 @set LJCOMPILE=%LJCOMPILE% /Zi\r
69-@set LJLINK=%LJLINK% /debug\r
70 :NODEBUG\r
71-@if "%1"=="amalg" goto :AMALGDLL\r
72-@if "%1"=="static" goto :STATIC\r
73-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c\r
74+@if "%2"=="amalg" goto :AMALGDLL\r
75+@if "%2"=="static" goto :STATIC\r
76+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb\r
77 @if errorlevel 1 goto :BAD\r
78 %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj\r
79 @if errorlevel 1 goto :BAD\r
80 @goto :MTDLL\r
81 :STATIC\r
82-%LJCOMPILE% lj_*.c lib_*.c\r
83+%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb\r
84 @if errorlevel 1 goto :BAD\r
85 %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj\r
86 @if errorlevel 1 goto :BAD\r
87 @goto :MTDLL\r
88 :AMALGDLL\r
89-%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL ljamalg.c\r
90+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\ljamalg.c\r
91 @if errorlevel 1 goto :BAD\r
92 %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj\r
93 @if errorlevel 1 goto :BAD\r
94@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c\r
95 if exist %LJDLLNAME%.manifest^\r
96 %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2\r
97 \r
98-%LJCOMPILE% luajit.c\r
99+%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb\r
100 @if errorlevel 1 goto :BAD\r
101 %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME%\r
102 @if errorlevel 1 goto :BAD\r
103@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^\r
104 %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe\r
105 \r
106 @del *.obj *.manifest minilua.exe buildvm.exe\r
107-@del host\buildvm_arch.h\r
108-@del lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h\r
109+@del %SOURCEDIR%\host\buildvm_arch.h\r
110+@del %SOURCEDIR%\lj_bcdef.h %SOURCEDIR%\lj_ffdef.h %SOURCEDIR%\lj_libdef.h %SOURCEDIR%\lj_recdef.h %SOURCEDIR%\lj_folddef.h\r
111 @echo.\r
112 @echo === Successfully built LuaJIT for Windows/%LJARCH% ===\r
113 \r
114@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^\r
115 @goto :END\r
116 :FAIL\r
117 @echo You must open a "Visual Studio .NET Command Prompt" to run this script\r
118+exit 1\r
119 :END\r