[Libreoffice-commits] core.git: Branch 'aoo/trunk' - python/python-2.7.9-pcbuild.patch

[Don Lewis]

 python/python-2.7.9-pcbuild.patch |   60 ++++++--------------------------------
 1 file changed, 10 insertions(+), 50 deletions(-)

New commits:
commit 9f2b8afd1c765042a3fec30f79105755f6fa9039
Author: Don Lewis <truckman at apache.org>
Date:   Fri Sep 2 11:07:49 2016 +0000

    Add missing quotes to .vcproj file to unbreak python build on Windows.

diff --git a/python/python-2.7.9-pcbuild.patch b/python/python-2.7.9-pcbuild.patch
index 5cd80b5..3c2a0a5 100644
--- a/python/python-2.7.9-pcbuild.patch
+++ b/python/python-2.7.9-pcbuild.patch
@@ -592,8 +592,8 @@ diff -u misc/Python-2.7.9/PCbuild/_sqlite3.vcproj misc/build/Python-2.7.9/PCbuil
  			<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.vcproj misc/build/Python-2.7.9/PCbuild/_s
  				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.vcproj misc/build/Python-2.7.9/PCbuild/_s
  				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.vcproj misc/build/Python-2.7.9/PCbuild/_s
  			/>
  			<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.vcproj misc/build/Python-2.7.9/PCbuild/_s
  			/>
  			<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