diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-07 23:02:44 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-08 19:30:45 +0300 |
commit | 67a733cd316638b31b5771f61e3b7f1d11f731f9 (patch) | |
tree | 4916b8ecbf4b10a4596e053630f901b469677e83 /openssl | |
parent | 58745c41ec65d13a59559d423f698f9f8ad92361 (diff) |
Release version 1.1.1+5v1.1.1+5
Adapt for building with Clang on Windows
Diffstat (limited to 'openssl')
-rw-r--r-- | openssl/build/root.build | 8 | ||||
-rw-r--r-- | openssl/manifest | 2 | ||||
-rw-r--r-- | openssl/openssl/buildfile | 11 |
3 files changed, 12 insertions, 9 deletions
diff --git a/openssl/build/root.build b/openssl/build/root.build index 2a4a530..e5ca350 100644 --- a/openssl/build/root.build +++ b/openssl/build/root.build @@ -7,6 +7,8 @@ using c h{*}: extension = h c{*}: extension = c -# The test target for cross-testing (running tests under Wine, etc). -# -test.target = $c.target +if ($c.target.system == 'win32-msvc') + c.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS + +if ($c.class == 'msvc') + c.coptions += /wd4251 /wd4275 /wd4800 diff --git a/openssl/manifest b/openssl/manifest index 9715011..e0c4a5e 100644 --- a/openssl/manifest +++ b/openssl/manifest @@ -3,7 +3,7 @@ name: openssl # Note: remember to update doc-url below! # -version: 1.1.1+4 +version: 1.1.1+5 upstream-version: 1.1.1c priority: security diff --git a/openssl/openssl/buildfile b/openssl/openssl/buildfile index b03de5f..5d87cd0 100644 --- a/openssl/openssl/buildfile +++ b/openssl/openssl/buildfile @@ -15,6 +15,8 @@ linux = ($tclass == 'linux') bsd = ($tclass == 'bsd') windows = ($tclass == 'windows') +msvc_runtime = ($c.target.system == 'win32-msvc') + gcc = ($c.class == 'gcc') msvc = ($c.class == 'msvc') @@ -43,13 +45,12 @@ else # Note that upstream also passes -DOPENSSL_USE_APPLINK if compiled with VC. # We drop this option (see libcrypto/buildfile) for details. # - if $msvc - { + if $msvc_runtime c.poptions += -DOPENSSL_SYS_WIN32 -D_CRT_SECURE_NO_DEPRECATE \ -D_WINSOCK_DEPRECATED_NO_WARNINGS + if $msvc c.coptions += /Gs0 /GF /Gy - } else c.poptions += -D_MT } @@ -91,7 +92,7 @@ else { c.libs += $regex.apply(ws2_32 gdi32 crypt32, \ '(.+)', \ - $msvc ? '\1.lib' : '-l\1') - if $msvc + $msvc_runtime ? '\1.lib' : '-l\1') + if $msvc_runtime c.libs += advapi32.lib } |