[Python-checkins] bpo-37156: Fix libssl DLL tag in MSI sources (GH-13866)
Miss Islington (bot)
webhook-mailer at python.org
Thu Jun 6 12:38:02 EDT 2019
https://github.com/python/cpython/commit/1c4084f4c13d7ec516abc0439288cbeb2c96489a
commit: 1c4084f4c13d7ec516abc0439288cbeb2c96489a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-06-06T09:37:59-07:00
summary:
bpo-37156: Fix libssl DLL tag in MSI sources (GH-13866)
(cherry picked from commit e0c0c7e8c9f8153a54b92e43aa3d09e69a9fd0c0)
Co-authored-by: Steve Dower <steve.dower at python.org>
files:
M Tools/msi/msi.props
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 0fe822af9319..5da901c0215a 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -87,15 +87,16 @@
PyArchExt=$(PyArchExt);
PyTestExt=$(PyTestExt);
OptionalFeatureName=$(OutputName);
+ ssltag=-1_1;
</DefineConstants>
<DefineConstants Condition="'$(CRTRedist)' != ''">
$(DefineConstants);CRTRedist=$(CRTRedist);
</DefineConstants>
<DefineConstants Condition="$(Platform) != 'x64'">
- $(DefineConstants);Suffix32=-32;ssltag=-1_1;
+ $(DefineConstants);Suffix32=-32;
</DefineConstants>
<DefineConstants Condition="$(Platform) == 'x64'">
- $(DefineConstants);Suffix32=;ssltag=-1_1-x64;
+ $(DefineConstants);Suffix32=;
</DefineConstants>
</PropertyGroup>
More information about the Python-checkins
mailing list