Author: rhuijben
Date: Thu Nov 9 12:32:29 2017
New Revision: 1814724
URL: http://svn.apache.org/viewvc?rev=1814724&view=rev
Log:
Allow building against OpenSSL 1.1.0 on Windows by properly detect the
library name, that starting with 1.1.0 now matches that on other platforms.
* build/generator/gen_win_dependencies.py
(_find_openssl): Use new library names when possible.
* build.conf
Use standard dependency notation on Windows to support dynamic names.
Modified:
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_win_dependencies.py
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1814724&r1=1814723&r2=1814724&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Thu Nov 9 12:32:29 2017
@@ -1471,8 +1471,7 @@ external-lib = $(SVN_SASL_LIBS)
[openssl]
type = lib
-external-lib = $(SVN_OPENSSL_LIBS)
-msvc-libs = ssleay32.lib libeay32.lib
+external-lib = $(SVN_OPENSSL_LIBS) $(SVN_LIBCRYPTO_LIBS)
[intl]
type = lib
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1814724&r1=1814723&r2=1814724&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Thu Nov 9
12:32:29 2017
@@ -1,4 +1,4 @@
-#
+f#
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -878,16 +878,22 @@ class GenDependenciesBase(gen_base.Gener
int(vermatch.group(4)))
openssl_version = vermatch.group(1)
+ libcrypto = 'libcrypto'
+ libssl = 'libssl'
+ if version < (1, 1, 0):
+ libcrypto = 'libeay32'
+ libssl = 'ssleay32'
+
self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
- 'ssleay32.lib',
+ '%s.lib' % (libssl,),
openssl_version,
- dll_name='ssleay32.dll',
+ dll_name='%s.dll' %
(libssl,),
dll_dir=bin_dir)
- self._libraries['libeay32'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
- 'libeay32.lib',
+ self._libraries['libcrypto'] = SVNCommonLibrary('openssl', inc_dir,
lib_dir,
+ '%s.lib' % (libcrypto,),
openssl_version,
- dll_name='libeay32.dll',
+ dll_name='%s.dll' %
(libcrypto,),
dll_dir=bin_dir)
def _find_perl(self, show_warnings):
