The branch master has been updated
via 475592e2419c5cb3098dfea4c9229d0c09ea7010 (commit)
via 111b234c8f80371e7e31d922946cbd546491d4e8 (commit)
from 1186a2b3d40e33cbf42d4fd3c7cc679f9f6e14f2 (commit)
- Log -----------------------------------------------------------------
commit 475592e2419c5cb3098dfea4c9229d0c09ea7010
Author: Richard Levitte <[email protected]>
Date: Mon Oct 24 15:11:29 2016 +0200
Windows: use default ZLIB1 unless --with-zlib-lib is set
Reviewed-by: Andy Polyakov <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1772)
commit 111b234c8f80371e7e31d922946cbd546491d4e8
Author: Richard Levitte <[email protected]>
Date: Mon Oct 24 15:03:57 2016 +0200
Fix the LIBZ macro on VC config targets
If zlib-dynamic was given but not --with-zlib-lib, LIBZ was defined to
the empty string. Instead, give it the default "ZLIB1".
Reviewed-by: Andy Polyakov <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1772)
-----------------------------------------------------------------------
Summary of changes:
Configurations/00-base-templates.conf | 5 +++--
Configurations/10-main.conf | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index ed50910..8c47e9e 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -80,10 +80,11 @@
sub {
unless ($disabled{zlib}) {
if (defined($disabled{"zlib-dynamic"})) {
- return $withargs{zlib_lib};
+ return $withargs{zlib_lib} // "ZLIB1";
}
}
- return (); },
+ return ();
+ },
ld => "link",
lflags => "/nologo",
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 5d11d3f..dd5085d 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1277,9 +1277,11 @@ sub vms_info {
cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo
-DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN
-D_CRT_SECURE_NO_DEPRECATE",
defines => add(sub { my @defs = ();
unless ($disabled{"zlib-dynamic"}) {
+ my $zlib =
+ $withargs{zlib_lib} // "ZLIB1";
push @defs,
quotify("perl",
- 'LIBZ="' .
$withargs{zlib_lib} . '"');
+ 'LIBZ="' . $zlib . '"');
}
return [ @defs ];
}),
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
