strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/python3/python-3.3.0-ssl.patch.1

372 lines
16 KiB
Groff
Raw Normal View History

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
2012-11-29 17:12:12 -06:00
-*- Mode: diff -*-
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
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
--- python3.old_/Modules/Setup.dist 2012-09-29 10:00:42.000000000 +0200
+++ python3/Modules/Setup.dist 2012-11-13 14:19:01.994158111 +0100
@@ -236,14 +236,14 @@
# The _md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.
-#_md5 md5module.c
+_md5 md5module.c
# The _sha module implements the SHA checksum algorithms.
# (NIST's Secure Hash Algorithms.)
-#_sha1 sha1module.c
-#_sha256 sha256module.c
-#_sha512 sha512module.c
+_sha1 sha1module.c
+_sha256 sha256module.c
+_sha512 sha512module.c
# The _tkinter module.
diff -ru python3.old_/PC/VS9.0/pcbuild.sln python3/PC/VS9.0/pcbuild.sln
--- python3.old_/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200
+++ python3/PC/VS9.0/pcbuild.sln 2012-11-13 14:44:29.329147866 +0100
@@ -136,11 +136,6 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj
--- python3.old_/PC/VS9.0/_ssl.vcproj 2012-09-29 10:00:47.000000000 +0200
+++ python3/PC/VS9.0/_ssl.vcproj 2012-11-13 14:27:15.874169273 +0100
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -56,7 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -180,7 +180,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -243,7 +243,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -305,7 +305,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -368,7 +368,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
TargetMachine="17"
/>
<Tool
@@ -417,7 +417,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -431,7 +431,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include"
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -494,7 +494,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
TargetMachine="17"
/>
<Tool
diff -ru python3.old_/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
--- python3.old_/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200
+++ python3/PCbuild/pcbuild.sln 2012-11-13 14:50:39.220142472 +0100
@@ -58,8 +58,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcxproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
--- python3.old_/PCbuild/_ssl.vcxproj 2012-09-29 10:00:48.000000000 +0200
+++ python3/PCbuild/_ssl.vcxproj 2012-11-13 14:55:50.298137715 +0100
@@ -151,14 +151,14 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -166,26 +166,26 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -193,26 +193,26 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
@@ -220,27 +220,27 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
@@ -248,14 +248,14 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
</ClCompile>
<PreLinkEvent>
<Command>
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
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
2012-11-29 17:12:12 -06:00
@@ -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>
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
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
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
@@ -757,7 +757,10 @@
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
convert openssl to gbuild and add to tail_build Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3 Reviewed-on: https://gerrit.libreoffice.org/1495 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-28 10:19:06 -06:00
+ ooosslinc = os.environ.get('WORKDIR') + '/' + \
+ '/UnpackedTarball/openssl/include/'
python3: add module for internal Python 3 build (not active yet) The module builds here on Fedora 17 and with MSVC2008. MacOS X is unfinished and probably breaks, which is why the module is disabled now. These patches from module python were dropped: Integrated upstream: - Python.mipsel-py4305.patch - Python-2.6.1-py4768.patch - Python-2.6.1-py2422.patch (modified, use --with-valgrind) - Python-2.6.1-urllib.patch - Python-2.6.1-py8067.patch Obsolete: - Python-2.6.1-svn-1.7.patch (migrated to non-toy HG now) - Python-parallel-make.patch - Python-2.6.1-nohardlink.patch (no idea why that would be needed, NFS should support hard links) - Python-2.6.1-sysbase.patch (Solaris 11 setsolar specific patch) - Python-2.6.1-cross.berkeleydb.patch (berekeleydb removal) - Python-2.6.2-bdb48.patch - Python-2.6.1-vc10.patch (upstream supports vc10) An attempt to cross compile with mingw that proved unsucessful according to dtardon; there is upstream work on this topic that is possibly already in 3.3: http://bugs.python.org/issue8067 - Python-2.6.2-cross.patch - Python-2.6.2-cross.fix-configure.patch Change-Id: Iba9a3cab955983e173e12110f93a6f381d86f9ce
2012-11-16 17:39:31 -06:00
search_for_ssl_incs_in = [
+ ooosslinc,
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -769,8 +774,13 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
+ ooossllib = os.environ.get('SOLARVER') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'lib'
+ ooosslinc = ooosslinc + '/'
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
+ [ooossllib,
+ '/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
Reference in a new issue Copy permalink