ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/luajit/001-fix-build-path.patch

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