You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2016/09/02 11:07:49 UTC
svn commit: r1758938 -
/openoffice/trunk/main/python/python-2.7.9-pcbuild.patch
Author: truckman
Date: Fri Sep 2 11:07:49 2016
New Revision: 1758938
URL: http://svn.apache.org/viewvc?rev=1758938&view=rev
Log:
Add missing quotes to .vcproj file to unbreak python build on Windows.
Modified:
openoffice/trunk/main/python/python-2.7.9-pcbuild.patch
Modified: openoffice/trunk/main/python/python-2.7.9-pcbuild.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-2.7.9-pcbuild.patch?rev=1758938&r1=1758937&r2=1758938&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-2.7.9-pcbuild.patch (original)
+++ openoffice/trunk/main/python/python-2.7.9-pcbuild.patch Fri Sep 2 11:07:49 2016
@@ -592,8 +592,8 @@ diff -u misc/Python-2.7.9/PCbuild/_sqlit
<Tool
Name="VCALinkTool"
diff -u misc/Python-2.7.9/PCbuild/_ssl.vcproj misc/build/Python-2.7.9/PCbuild/_ssl.vcproj
---- misc/Python-2.7.9/PCbuild/_ssl.vcproj 2012-04-09 18:07:35.000000000 -0500
-+++ misc/build/Python-2.7.9/PCbuild/_ssl.vcproj 2012-07-30 20:59:37.000000000 -0500
+--- misc/Python-2.7.9/PCbuild/_ssl.vcproj 2014-12-10 07:59:58.000000000 -0800
++++ misc/build/Python-2.7.9/PCbuild/_ssl.vcproj 2016-09-02 03:56:17.659101000 -0700
@@ -43,7 +43,7 @@
/>
<Tool
@@ -609,7 +609,7 @@ diff -u misc/Python-2.7.9/PCbuild/_ssl.v
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -628,7 +628,7 @@ diff -u misc/Python-2.7.9/PCbuild/_ssl.v
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -660,47 +660,17 @@ diff -u misc/Python-2.7.9/PCbuild/_ssl.v
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -247,8 +250,8 @@
+@@ -247,7 +250,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-- />
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
- <Tool
- Name="VCALinkTool"
- />
-@@ -296,7 +299,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc32"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -310,8 +313,8 @@
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
- Name="VCLinkerTool"
-- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-- />
-+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib />
- <Tool
Name="VCALinkTool"
- />
-@@ -360,7 +363,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
-@@ -424,7 +427,7 @@
+@@ -296,7 +300,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -709,26 +679,16 @@ diff -u misc/Python-2.7.9/PCbuild/_ssl.v
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -438,8 +441,8 @@
+@@ -310,7 +314,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-- />
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib />
- <Tool
- Name="VCALinkTool"
- />
-@@ -488,7 +491,7 @@
- />
- <Tool
- Name="VCCLCompilerTool"
-- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
/>
<Tool
- Name="VCManagedResourceCompilerTool"
+ Name="VCALinkTool"
diff -u misc/Python-2.7.9/PCbuild/_testcapi.vcproj misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj
--- misc/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.9/PCbuild/_testcapi.vcproj 2012-07-30 20:59:37.000000000 -0500