This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch openssl
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/openssl by this push:
     new b94d5c4ccd Copy openssl .so files
b94d5c4ccd is described below

commit b94d5c4ccdef565fe839acb13ab7bd494efb7bee
Author: Arrigo Marchiori <[email protected]>
AuthorDate: Sun May 1 10:10:58 2022 +0200

    Copy openssl .so files
---
 main/openssl/prj/d.lst                    | 4 ++--
 main/scp2/source/ooo/file_library_ooo.scp | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst
index 6b67f0fefc..bfd80e44f8 100644
--- a/main/openssl/prj/d.lst
+++ b/main/openssl/prj/d.lst
@@ -5,6 +5,6 @@ mkdir: %_DEST%\inc%_EXT%\external\openssl
 ..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
 ..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
 ..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a
+..\%__SRC%\lib\libcrypto.* %_DEST%\lib%_EXT%\libcrypto.*
+..\%__SRC%\lib\libssl.* %_DEST%\lib%_EXT%\libssl.*
  
diff --git a/main/scp2/source/ooo/file_library_ooo.scp 
b/main/scp2/source/ooo/file_library_ooo.scp
index d8eda0b4ba..f74322ab7a 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1771,6 +1771,8 @@ File gid_File_Lib_Openssl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef WNT
     Name = "ssleay32.dll";
+  #else
+    Name = "libssl.so";
   #endif
 End
 #endif
@@ -1783,6 +1785,8 @@ File gid_File_Lib_Crypto
 
        #ifdef WNT
          Name = "libeay32.dll";
+        #else
+          Name = "libcrypto.so";
        #endif
 End
 #endif

Reply via email to