Author: arielch
Date: Fri Jul 20 00:35:43 2012
New Revision: 1363599
URL: http://svn.apache.org/viewvc?rev=1363599&view=rev
Log:
Fix build breaker: malformed Python patch
Modified:
incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch
Modified: incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch?rev=1363599&r1=1363598&r2=1363599&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch (original)
+++ incubator/ooo/trunk/main/python/Python-2.6.1-security-flags.patch Fri Jul
20 00:35:43 2012
@@ -539,12 +539,10 @@
Name="VCALinkTool"
--- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2012-07-17 13:58:39.048409000
+0200
+++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2012-07-17
13:57:52.319736300 +0200
-@@ -57,8 +57,7 @@
+@@ -57,6 +57,7 @@
/>
<Tool
Name="VCLinkerTool"
-- RandomizedBaseAddress="1"
-- DataExecutionPrevention="1"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
AdditionalDependencies="ws2_32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
