The branch master has been updated via 34da11b39d2421f546ec568f355875eec353844c (commit) via ef5b8296a1e29013281d655914fe1b778030fb01 (commit) from e951eca8b4bfd58f37b25d4ded6c770812443c23 (commit)
- Log ----------------------------------------------------------------- commit 34da11b39d2421f546ec568f355875eec353844c Author: Richard Levitte <levi...@openssl.org> Date: Fri Apr 15 09:17:13 2016 +0200 Don't use a default for --with-zlib-lib on Windows with option 'zlib' To begin with, the default should have been the import library, not the DLL itself. However, we don't know what directory it's installed in either way, so we may as well demand the full path from the user Reviewed-by: Matt Caswell <m...@openssl.org> commit ef5b8296a1e29013281d655914fe1b778030fb01 Author: Richard Levitte <levi...@openssl.org> Date: Fri Apr 15 07:53:17 2016 +0200 ex_libs settings have to be added to, not overriden, on Windows too Reviewed-by: Matt Caswell <m...@openssl.org> ----------------------------------------------------------------------- Summary of changes: Configurations/00-base-templates.conf | 2 +- Configurations/10-main.conf | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 0211a8c..c28e4e1 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -80,7 +80,7 @@ sub { unless ($disabled{zlib}) { if (defined($disabled{"zlib-dynamic"})) { - return $withargs{zlib_lib} || "zlib1.lib"; + return $withargs{zlib_lib}; } } return (); }, diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 69087d9..4a8fb00 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1298,20 +1298,20 @@ sub vms_info { release => sub { $disabled{shared} ? "/MT" : () }, )), bin_lflags => add("/subsystem:console /opt:ref"), - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'ws2_32.lib' unless $disabled{sock}; push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib'; return join(" ", @ex_libs); - }, + }), }, "VC-WIN64-common" => { inherit_from => [ "VC-noCE-common" ], - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); return join(" ", @_, @ex_libs); - }, + }), bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN", build_scheme => add("VC-W64", { separator => undef }), }, @@ -1349,14 +1349,14 @@ sub vms_info { return $ver ge $vew ? "nasm" : "nasmw" }, asflags => "-f win32", asoutflag => "-o", - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); # WIN32 UNICODE build gets linked with unicows.lib for # backward compatibility with Win9x. push @ex_libs, 'unicows.lib' if (grep { $_ eq "UNICODE" } @user_defines); return join(" ", @ex_libs, @_); - }, + }), sys_id => "WIN32", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", perlasm_scheme => "win32n", @@ -1387,7 +1387,7 @@ sub vms_info { ? "/entry:mainCRTstartup" : (); }), sys_id => "WINCE", bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", - ex_libs => sub { + ex_libs => add(sub { my @ex_libs = (); push @ex_libs, 'ws2.lib' unless $disabled{sock}; push @ex_libs, 'crypt32.lib'; @@ -1405,7 +1405,7 @@ sub vms_info { push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86"); return @ex_libs; - }, + }), build_scheme => add("VC-WCE", { separator => undef }), }, _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits