X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fjaegertracing%2Fopentelemetry-cpp%2Ftools%2Fvcpkg%2Fports%2Fvs-yasm%2Ffix_paths.patch;fp=ceph%2Fsrc%2Fjaegertracing%2Fopentelemetry-cpp%2Ftools%2Fvcpkg%2Fports%2Fvs-yasm%2Ffix_paths.patch;h=8b74a3aa179b0648403ad5b9886a060b55f8c725;hb=1e59de90020f1d8d374046ef9cca56ccd4e806e2;hp=0000000000000000000000000000000000000000;hpb=bd41e436e25044e8e83156060a37c23cb661c364;p=ceph.git

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/vs-yasm/fix_paths.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/vs-yasm/fix_paths.patch
new file mode 100644
index 000000000..8b74a3aa1
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/vs-yasm/fix_paths.patch
@@ -0,0 +1,23 @@
+diff --git a/yasm.props b/yasm.props
+index 06efe7a..10f6309 100644
+--- a/yasm.props
++++ b/yasm.props
+@@ -6,15 +6,15 @@
+     <YASMAfterTargets>CustomBuild</YASMAfterTargets>
+   </PropertyGroup>
+   <PropertyGroup>
+-    <YasmPath Condition= "'$(YASMPATH)' == ''">$(VCInstallDir)</YasmPath>
++    <YasmPath Condition= "'$(YasmPath)' == ''">$(VCInstallDir)</YasmPath>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+     <YASM>
+       <Preprocessor>0</Preprocessor>
+       <Parser>0</Parser>
+       <ObjectFileName>$(IntDir)%(FileName).obj</ObjectFileName>
+-      <CommandLineTemplate Condition="'$(Platform)' == 'Win32'">"$(YasmPath)"yasm.exe -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
+-      <CommandLineTemplate Condition="'$(Platform)' == 'x64'">"$(YasmPath)"yasm.exe -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
++      <CommandLineTemplate Condition="'$(Platform)' == 'Win32'">"$(YasmPath)" -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
++      <CommandLineTemplate Condition="'$(Platform)' == 'x64'">"$(YasmPath)" -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>
+       <CommandLineTemplate Condition="'$(Platform)' != 'Win32' and '$(Platform)' != 'x64'">echo YASM not supported on this platform
+ exit 1</CommandLineTemplate>
+       <ExecutionDescription>%(Identity)</ExecutionDescription>