summaryrefslogtreecommitdiff
path: root/external/python3
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-01-11 22:36:04 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2015-01-11 21:44:02 +0000
commit5ae245a8894dbda2915a1bf695e25ef8bb17096f (patch)
tree85772584a60094303bb157c7783373fd6fd6db9b /external/python3
parentbf964151a77d8f63dac031fec5800a7bb43b3e5b (diff)
Fix Python build in debug mode on x86_64 platform on windows
8a6c5b2f fixed Python build in release mode for x64, but missed to do the same for the debug mode. Change-Id: I9762b4089ec95fbd8af12e581fbe8577be5f802a Reviewed-on: https://gerrit.libreoffice.org/13089 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/python3')
-rw-r--r--external/python3/python-3.3.0-msvc-x64.patch.140
1 files changed, 40 insertions, 0 deletions
diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1
index 8882a1c87fc0..a92acc77a563 100644
--- a/external/python3/python-3.3.0-msvc-x64.patch.1
+++ b/external/python3/python-3.3.0-msvc-x64.patch.1
@@ -208,6 +208,35 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+@@ -172,9 +172,9 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <CustomBuildStep>
+ <Message>Build PC/pythonnt_rc(_d).h</Message>
+ <Command>cd $(SolutionDir)
+-make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h
++amd64\make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h
+ </Command>
+ <Outputs>$(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <Midl>
+@@ -186,14 +186,15 @@
+ <IntrinsicFunctions>false</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+- <OutputFile>$(SolutionDir)make_versioninfo_d.exe</OutputFile>
++ <OutputFile>$(SolutionDir)amd64\make_versioninfo_d.exe</OutputFile>
++ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Command>cd $(SolutionDir)
+-make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h
++amd64\make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
--- python3/PCbuild/pythoncore.vcxproj
+++ python3/PCbuild/pythoncore.vcxproj
@@ -195,35 +195,35 @@
@@ -247,3 +276,14 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
+@@ -289,9 +289,9 @@
+ <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <PreLinkEvent>
+ <Message>Generate build information...</Message>
+- <Command>"$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"</Command>
++ <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Debug "$(IntDir)"</Command>
+ </PreLinkEvent>
+ <Link>
+ <AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>