mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
libreoffice/external/python33/python-3.3.3-msvc2012-winxp.patch.1
David Ostrovsky 147cb6a2ae Bump python to 3.5 
3.5 release is needed for MSVC 14.0 (aka VS 2015) support. Python 3.5
removed build toolchain support for MSVC 2013. Because we still need
to support it, we duplicate the Python directory in externals and
copy old patches and dispatch to this directory for MSVC 2013. Once
the support for MSVC 2013 is dropped on master, this directory can be
removed again.

Change-Id: Idf7bc351239582f583ecbdb53c923cbdcf968089
Reviewed-on: https://gerrit.libreoffice.org/17352
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2015-10-25 08:29:39 +00:00

118 lines
4.8 KiB
Groff
Raw Blame History

without explicit subsystem set, the linker tries to open a file
with the name of the comptibility version
(fatal error LNK1181: cannot open input file ",5.01")
diff -ur python3.org/PCbuild/_ctypes.vcxproj python3/PCbuild/_ctypes.vcxproj
--- python3.org/PCbuild/_ctypes.vcxproj 2014-05-19 19:06:01.274114800 +0200
+++ python3/PCbuild/_ctypes.vcxproj 2014-05-19 19:07:13.649079800 +0200
@@ -174,7 +174,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -187,7 +187,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -197,7 +197,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -210,7 +210,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -221,7 +221,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -234,7 +234,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
diff -ur python3.org/PCbuild/_decimal.vcxproj python3/PCbuild/_decimal.vcxproj
--- python3.org/PCbuild/_decimal.vcxproj 2014-05-19 19:06:01.274114800 +0200
+++ python3/PCbuild/_decimal.vcxproj 2014-05-19 19:07:13.649079800 +0200
@@ -176,7 +176,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -189,7 +189,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;..\Include;..\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -199,7 +199,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -212,7 +212,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -223,7 +223,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
</Link>
</ItemDefinitionGroup>
@@ -236,7 +236,7 @@
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <SubSystem>NotSet</SubSystem>
+ <SubSystem>Console</SubSystem>
<BaseAddress>0x1D1A0000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
Reference in New Issue View Git Blame Copy Permalink