diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
| commit | 28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7 (patch) | |
| tree | a7952616386d4fa19ee9f44aff204e27de85f249 /ports/jemalloc/fix-utilities.patch | |
| parent | 957cb214e92f45069f142d8b6ccf2a6425df9c51 (diff) | |
| parent | cd7f4cccffd915edc2d4b625ff32dea970ec073f (diff) | |
| download | vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.tar.gz vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.zip | |
Merge branch 'master' into qualifier_change
Diffstat (limited to 'ports/jemalloc/fix-utilities.patch')
| -rw-r--r-- | ports/jemalloc/fix-utilities.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ports/jemalloc/fix-utilities.patch b/ports/jemalloc/fix-utilities.patch new file mode 100644 index 000000000..32c39e0b3 --- /dev/null +++ b/ports/jemalloc/fix-utilities.patch @@ -0,0 +1,30 @@ +diff --git a/Utilities.cmake b/Utilities.cmake +index 562e948..d2d3530 100644 +--- a/Utilities.cmake ++++ b/Utilities.cmake +@@ -633,9 +633,11 @@ file(TO_NATIVE_PATH "${file_path}" ntv_file_path) + # This converts #undefs into #cmakedefines so configure_file can handle it + set(PS_CMD + "Get-Content \"${ntv_file_path}\" | +-ForEach { ++ForEach { + if($_ -match '^#undef[ \t]*[^ \t]*') +- { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}}" ++ { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_} ++} | ++Set-Content \"${ntv_file_path}.cmake\"" + ) + + if(EXISTS ${file_path}) +@@ -646,9 +648,8 @@ if(EXISTS ${file_path}) + # Convert autoconf .in into a cmake .in + execute_process(COMMAND powershell -Command "${PS_CMD}" + RESULT_VARIABLE error_level +- ERROR_VARIABLE error_output +- OUTPUT_FILE ${file_path}.cmake) +- ++ ERROR_VARIABLE error_output) ++ + if(NOT ${error_level} EQUAL 0) + message(FATAL_ERROR "Powershell completed with ${error_level} : ${error_output}") + endif() |