]> git.proxmox.com Git - ceph.git/blobdiff - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/vs-yasm/fix_paths.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / vs-yasm / fix_paths.patch
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 (file)
index 0000000..8b74a3a
--- /dev/null
@@ -0,0 +1,23 @@
+diff --git a/yasm.props b/yasm.props\r
+index 06efe7a..10f6309 100644\r
+--- a/yasm.props\r
++++ b/yasm.props\r
+@@ -6,15 +6,15 @@\r
+     <YASMAfterTargets>CustomBuild</YASMAfterTargets>\r
+   </PropertyGroup>\r
+   <PropertyGroup>\r
+-    <YasmPath Condition= "'$(YASMPATH)' == ''">$(VCInstallDir)</YasmPath>\r
++    <YasmPath Condition= "'$(YasmPath)' == ''">$(VCInstallDir)</YasmPath>\r
+   </PropertyGroup>\r
+   <ItemDefinitionGroup>\r
+     <YASM>\r
+       <Preprocessor>0</Preprocessor>\r
+       <Parser>0</Parser>\r
+       <ObjectFileName>$(IntDir)%(FileName).obj</ObjectFileName>\r
+-      <CommandLineTemplate Condition="'$(Platform)' == 'Win32'">"$(YasmPath)"yasm.exe -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>\r
+-      <CommandLineTemplate Condition="'$(Platform)' == 'x64'">"$(YasmPath)"yasm.exe -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>\r
++      <CommandLineTemplate Condition="'$(Platform)' == 'Win32'">"$(YasmPath)" -Xvc -f win32 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>\r
++      <CommandLineTemplate Condition="'$(Platform)' == 'x64'">"$(YasmPath)" -Xvc -f win64 [AllOptions] [AdditionalOptions] "%(FullPath)"</CommandLineTemplate>\r
+       <CommandLineTemplate Condition="'$(Platform)' != 'Win32' and '$(Platform)' != 'x64'">echo YASM not supported on this platform\r
+ exit 1</CommandLineTemplate>\r
+       <ExecutionDescription>%(Identity)</ExecutionDescription>\r