Author: kotkov
Date: Fri Apr 21 10:42:16 2023
New Revision: 1909314
URL: http://svn.apache.org/viewvc?rev=1909314&view=rev
Log:
On the '1.3.x' branch: Merge r1814714 from trunk:
* r1814714
Support building against OpenSSL 1.1.0 on Windows
Justification:
We already support building against 1.1.0 on other platforms
Branch:
^/serf/branches/1.3.x-r1814714
Votes:
+1: rhuijben, astieger, ivan
Modified:
serf/branches/1.3.x/ (props changed)
serf/branches/1.3.x/SConstruct
serf/branches/1.3.x/STATUS
Propchange: serf/branches/1.3.x/
------------------------------------------------------------------------------
Merged /serf/branches/1.3.x-r1814714:r1814716-1909313
Merged /serf/trunk:r1814714
Modified: serf/branches/1.3.x/SConstruct
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/SConstruct?rev=1909314&r1=1909313&r2=1909314&view=diff
==============================================================================
--- serf/branches/1.3.x/SConstruct (original)
+++ serf/branches/1.3.x/SConstruct Fri Apr 21 10:42:16 2023
@@ -335,7 +335,6 @@ if sys.platform == 'win32':
LIBPATH=['$ZLIB'])
# openssl
- env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
if not env.get('SOURCE_LAYOUT', None):
env.Append(CPPPATH=['$OPENSSL/include/openssl'],
LIBPATH=['$OPENSSL/lib'])
@@ -345,6 +344,14 @@ if sys.platform == 'win32':
else:
env.Append(CPPPATH=['$OPENSSL/inc32'],
LIBPATH=['$OPENSSL/out32dll'])
+ conf = Configure(env)
+ if conf.CheckLib('libcrypto'):
+ # OpenSSL 1.1.0+
+ env.Append(LIBS=['libcrypto.lib', 'libssl.lib'])
+ else:
+ # Legacy OpenSSL
+ env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
+ conf.Finish()
else:
if os.path.isdir(apr):
apr = os.path.join(apr, 'bin', 'apr-1-config')
Modified: serf/branches/1.3.x/STATUS
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x/STATUS?rev=1909314&r1=1909313&r2=1909314&view=diff
==============================================================================
--- serf/branches/1.3.x/STATUS (original)
+++ serf/branches/1.3.x/STATUS Fri Apr 21 10:42:16 2023
@@ -37,12 +37,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1814714
- Support building against OpenSSL 1.1.0 on Windows
- Justification:
- We already support building against 1.1.0 on other platforms
- Branch:
- ^/serf/branches/1.3.x-r1814714
- Votes:
- +1: rhuijben, astieger, ivan
