From aaa6a031ced87d5b2c04023029bc5746dac52cb4 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Mon, 29 Mar 2021 13:09:14 -0400
Subject: [python3] Add feature deprecated-win7-support. (#16420)

* [python3] Move /MACHINE into MSBuild file.

This prevents potential patch application conflicts.

* [python3] Add feature deprecated-win7-support.

This backports the fix for bpo-39401 from the Python 3.8 branch instead
of the one from the Python 3.9 branch, which dropped support for Windows
7.

* [python3] Bump port version.

* [python3] Fix goof in static patch that omitted pathcch.lib.

* x-add-version

* [python3] Revert trivial patch changes

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
---
 ports/python3/python_vcpkg.props.in | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ports/python3/python_vcpkg.props.in')

diff --git a/ports/python3/python_vcpkg.props.in b/ports/python3/python_vcpkg.props.in
index c786e5fa0..e5b6093a5 100644
--- a/ports/python3/python_vcpkg.props.in
+++ b/ports/python3/python_vcpkg.props.in
@@ -31,5 +31,11 @@
         ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
+
+    <Lib>
+      <!-- Required to prevent linker errors on Visual Studio 2017 with static CRT -->
+      <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x86'">MachineX86</TargetMachine>
+      <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x64'">MachineX64</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
 </Project>
-- 
cgit v1.2.3