Skip to content
This repository has been archived by the owner on Jan 7, 2020. It is now read-only.

Commit

Permalink
Following up on r1814724, r1814725, also fix the DLL name for OpenSSL
Browse files Browse the repository at this point in the history
1.1.0 to allow the test code to automatically copy the required libraries.

* build/generator/gen_win_dependencies.py
  (_find_openssl): Generate dll name for 1.1.0+.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1814726 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
rhuijben committed Nov 9, 2017
1 parent 5d129b5 commit 864e9c3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build/generator/gen_win_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -880,20 +880,24 @@ def _find_openssl(self, show_warnings):

libcrypto = 'libcrypto'
libssl = 'libssl'
versuffix = '-%d_%d' % version[0:2]
if version < (1, 1, 0):
libcrypto = 'libeay32'
libssl = 'ssleay32'
versuffix = ''

self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
'%s.lib' % (libssl,),
openssl_version,
dll_name='%s.dll' % (libssl,),
dll_name='%s%s.dll' %
(libssl, versuffix),
dll_dir=bin_dir)

self._libraries['libcrypto'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
'%s.lib' % (libcrypto,),
openssl_version,
dll_name='%s.dll' % (libcrypto,),
dll_name='%s%s.dll' %
(libcrypto, versuffix),
dll_dir=bin_dir)

def _find_perl(self, show_warnings):
Expand Down

0 comments on commit 864e9c3

Please sign in to comment.