You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2021/11/24 20:54:06 UTC
[openoffice] 02/02: Fix OpenSSL libraries names on Windows
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit b83758ee095cd6fd594bc75d418e2491fd753d5d
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Wed Nov 24 21:52:54 2021 +0100
Fix OpenSSL libraries names on Windows
---
main/python/makefile.mk | 3 +-
main/python/python-2.7.18-msvs9-openssl.patch | 74 +++++++++++++++++++++++++++
2 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/main/python/makefile.mk b/main/python/makefile.mk
index b30cb55..6817d11 100644
--- a/main/python/makefile.mk
+++ b/main/python/makefile.mk
@@ -54,7 +54,8 @@ PATCH_FILES=\
.IF "$(GUI)"=="WNT"
.IF "$(CPUNAME)"=="INTEL"
-PATCH_FILES += python-$(PYVERSION)-msvs9.patch
+PATCH_FILES += python-$(PYVERSION)-msvs9.patch \
+ python-$(PYVERSION)-msvs9-openssl.patch
.ELIF "$(CPUNAME)"=="X86_64"
PATCH_FILES += \
python-$(PYVERSION)-msvs9-win64.patch \
diff --git a/main/python/python-2.7.18-msvs9-openssl.patch b/main/python/python-2.7.18-msvs9-openssl.patch
new file mode 100644
index 0000000..675b155
--- /dev/null
+++ b/main/python/python-2.7.18-msvs9-openssl.patch
@@ -0,0 +1,74 @@
+--- misc//Python-2.7.18/PC/VS9.0/_ssl.vcproj 2021-11-23 22:25:19.674332100 +0100
++++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2021-11-23 22:31:24.955359600 +0100
+@@ -58,7 +58,7 @@
+ <Tool
+ Name="VCLinkerTool"
+ 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)\libcrypto.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -122,7 +122,7 @@
+ <Tool
+ Name="VCLinkerTool"
+ 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)\libcrypto.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -186,7 +186,7 @@
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+- AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -251,7 +251,7 @@
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/SAFESEH /NXCOMPAT /DYNAMICBASE"
+- AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -315,7 +315,7 @@
+ <Tool
+ Name="VCLinkerTool"
+ 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)\libcrypto.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -379,7 +379,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\libcrypto.lib $(opensslDir)\libssl.lib"
+ TargetMachine="17"
+ />
+ <Tool
+@@ -443,7 +443,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\libcrypto.lib $(opensslDir)\libssl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -507,7 +507,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\libcrypto.lib $(opensslDir)\libssl.lib"
+ TargetMachine="17"
+ />
+ <Tool