diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-10-28 14:26:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 14:26:41 -0700 |
| commit | 1b1c17de8206231831b2bc8a06cff80506184be1 (patch) | |
| tree | b14e701224a7b12015ec3fef4782332251cd34de /ports/vs-yasm/fix_paths.patch | |
| parent | 0ff714bd520f5315081db50acce43644832451ba (diff) | |
| download | vcpkg-1b1c17de8206231831b2bc8a06cff80506184be1.tar.gz vcpkg-1b1c17de8206231831b2bc8a06cff80506184be1.zip | |
[vcpkg baseline] [vs-yasm] Build yasm instead of downloading it to work around memory corruption bugs in yasm itself. (#14003)
Diffstat (limited to 'ports/vs-yasm/fix_paths.patch')
| -rw-r--r-- | ports/vs-yasm/fix_paths.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ports/vs-yasm/fix_paths.patch b/ports/vs-yasm/fix_paths.patch new file mode 100644 index 000000000..8b74a3aa1 --- /dev/null +++ b/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>
|