diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-09-29 12:00:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 09:00:21 -0700 |
| commit | f819f66b4c2a639e18233bc30deb98531a386f78 (patch) | |
| tree | 9ddc0edc67de15f109bd17bea2de9c68ea43d706 /ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch | |
| parent | 6d4792b777078a8206f291075964c5870ae46c6c (diff) | |
| download | vcpkg-f819f66b4c2a639e18233bc30deb98531a386f78.tar.gz vcpkg-f819f66b4c2a639e18233bc30deb98531a386f78.zip | |
[python3] Add patch to fix Windows 11 SDK build failure. (#20292)
* [python3] Remove spurious dependencies.
* [python3] Add workaround for SDK 10.0.22000.0
* x-add-version
Diffstat (limited to 'ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch')
| -rw-r--r-- | ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch b/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch new file mode 100644 index 000000000..e5f8237d1 --- /dev/null +++ b/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch @@ -0,0 +1,30 @@ +From 0a72b7061ed79c5d6d37b41a5b1610e32fb371a4 Mon Sep 17 00:00:00 2001 +From: Adam Johnson <AdamJohnso@gmail.com> +Date: Wed, 22 Sep 2021 21:04:21 -0400 +Subject: [PATCH] workaround windows 11 sdk rc compiler error + +winnt.h was changed to error if the `SYSTEM_CACHE_ALIGNMENT` cannot be +determined. when the RC compiler is invoked, this seems to fail where +previous SDKs silently set the ARM value. +--- + PC/python_ver_rc.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h +index 90fc6ba1a1..e313a5138e 100644 +--- a/PC/python_ver_rc.h ++++ b/PC/python_ver_rc.h +@@ -1,3 +1,10 @@ ++// Temporarily workaround bug in Windows SDK 10.0.22000.0 winnt.h ++#ifdef RC_INVOKED ++# ifndef SYSTEM_CACHE_ALIGNMENT_SIZE ++# define SYSTEM_CACHE_ALIGNMENT_SIZE 64 ++# endif ++#endif ++ + // Resource script for Python core DLL. + // Currently only holds version information. + // +-- +2.33.0.windows.1 + |