[Libreoffice-commits] .: 2 commits - python3/ExternalProject_python3.mk python3/python-3.3.0-ssl.patch.1

[Libreoffice Gerrit user]

 python3/ExternalProject_python3.mk |    8 ++++----
 python3/python-3.3.0-ssl.patch.1   |   13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 1ea411fb15930d734fb31c28dde01d919bd22f38
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 30 01:13:15 2012 +0200

    We need to tell the MSVS 2010 build to use Windows7.1SDK
    
    At least for me it wouldn't build otherwise. But yeah, what it
    somebody uses MSVS 2010 with another SDK? It seems that the solution
    only offers the SDK 7.1 as an alternative?
    
    The default was v100, whatever that measn. Could it be that my MSVS
    2010 installation is borked? Or that I did not have to install a
    bundled SDK with it, because I already had a separate 7.1 SDK?
    
    Also simplify a bit, no need to $(filter) on VCVER inside ifeqs that
    already check the very same VCVER.
    
    Change-Id: Ifef98c9466fc24db27d9e38c6878c77adfb4ed75

diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index b7ed7bd..b47f303 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -28,19 +28,19 @@ ifeq ($(VCVER),110)
 	cd $(EXTERNAL_WORKDIR)/PCbuild \
 	&& MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=v110 \
 	&& cd $(EXTERNAL_WORKDIR) \
-	&& ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \
+	&& ln -s PCbuild LO_lib \
 	&& touch $@
 else ifeq ($(VCVER),100)
 	cd $(EXTERNAL_WORKDIR)/PCbuild \
-	&& MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 \
+	&& MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build /p:Configuration=Release /p:PlatformToolset=Windows7.1SDK /ToolsVersion:4.0 \
 	&& cd $(EXTERNAL_WORKDIR) \
-	&& ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \
+	&& ln -s PCbuild LO_lib \
 	&& touch $@
 else ifeq ($(VCVER),90)
 	cd $(EXTERNAL_WORKDIR)/PC/VS9.0 \
 	&& MAKEFLAGS= $(COMPATH)/vcpackages/vcbuild.exe pcbuild.sln "Release|$(if $(filter INTEL,$(CPUNAME)),Win32,x64)" \
 	&& cd $(EXTERNAL_WORKDIR) \
-	&& ln -s $(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild) LO_lib \
+	&& ln -s PC/VS9.0 LO_lib \
 	&& touch $@
 endif
 
commit 38fed61f63d4f4078a51916acd8ebd34b9e3f695
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 30 01:12:12 2012 +0200

    Kill the ProjectReference to ssl.vcxproj, too
    
    Otherwise it would try to build the ssl.vcxproj which we don't want
    (because we want to use the openSSL already built from solver), and
    which fails anyway because for some reason it wants to run
    python_d.exe.
    
    Change-Id: I7471bc26ae96be84b976ba35bb959d75678df980

diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1
index b7ba5b5..852da8d 100644
--- a/python3/python-3.3.0-ssl.patch.1
+++ b/python3/python-3.3.0-ssl.patch.1
@@ -1,3 +1,5 @@
+-*- Mode: diff -*-
+
 Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc.
 
 diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
@@ -327,6 +329,17 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
        <TargetMachine>MachineX64</TargetMachine>
      </Link>
    </ItemDefinitionGroup>
+@@ -271,10 +271,6 @@
+       <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+     </ProjectReference>
+-    <ProjectReference Include="ssl.vcxproj">
+-      <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
+-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+-    </ProjectReference>
+     <ProjectReference Include="_socket.vcxproj">
+       <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project>
+       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 diff -ru python3.old_/setup.py python3/setup.py
 --- python3.old_/setup.py	2012-09-29 10:00:50.000000000 +0200
 +++ python3/setup.py	2012-11-13 14:18:23.484158149 +0100