diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2016-12-16 11:16:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2016-12-16 11:16:06 -0500 |
| commit | 94ec9f4963751c25d9cd9c4e568693f2b58c8ef1 (patch) | |
| tree | 68a40475c42618f04f371ad8dd1d5d5c8a3b7c63 /winbuild | |
| parent | 9d5948a238c58c4d5550d3485ba26237bffb43ba (diff) | |
| download | pycurl-94ec9f4963751c25d9cd9c4e568693f2b58c8ef1.tar.gz | |
Updating to use openssl 1.1.0 - openssl/libcurl build changes
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/openssl-fix-crt-1.0.2.patch (renamed from winbuild/openssl-fix-crt.patch) | 9 | ||||
| -rw-r--r-- | winbuild/openssl-fix-crt-1.1.0.patch | 29 |
2 files changed, 37 insertions, 1 deletions
diff --git a/winbuild/openssl-fix-crt.patch b/winbuild/openssl-fix-crt-1.0.2.patch index afa8e89..d0ce166 100644 --- a/winbuild/openssl-fix-crt.patch +++ b/winbuild/openssl-fix-crt-1.0.2.patch @@ -18,7 +18,7 @@ } else { $base_cflags.=' /MC'; } -@@ -130,7 +130,7 @@ +@@ -130,13 +130,13 @@ else # Win32 { $base_cflags= " $mf_cflag"; @@ -27,3 +27,10 @@ $ff = "/fixed"; $opt_cflags=$f.' /Ox /O2 /Ob2'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /subsystem:console /opt:ref"; + } +-$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib ++#$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $mlflags=''; + + $out_def ="out32"; $out_def.="dll" if ($shlib); diff --git a/winbuild/openssl-fix-crt-1.1.0.patch b/winbuild/openssl-fix-crt-1.1.0.patch new file mode 100644 index 0000000..d04b15d --- /dev/null +++ b/winbuild/openssl-fix-crt-1.1.0.patch @@ -0,0 +1,29 @@ +--- Configurations/10-main.conf.orig 2016-11-10 06:03:43.000000000 -0800 ++++ Configurations/10-main.conf 2016-12-15 20:18:47.576426000 -0800 +@@ -1291,7 +1291,7 @@ + ($disabled{shared} ? "" : "/MD") + ." /O2"; + })), +- lib_cflags => add(sub { $disabled{shared} ? "/MT /Zl" : () }), ++ lib_cflags => add(sub { $disabled{shared} ? "/MD" : () }), + # Following might/should appears controversial, i.e. defining + # /MDd without evaluating $disabled{shared}. It works in + # non-shared build because static library is compiled with /Zl +@@ -1304,7 +1304,7 @@ + # prefer [non-debug] openssl.exe to be free from Micorosoft RTL + # redistributable. + bin_cflags => add(picker(debug => "/MDd", +- release => sub { $disabled{shared} ? "/MT" : () }, ++ release => sub { $disabled{shared} ? "/MD" : () }, + )), + bin_lflags => add("/subsystem:console /opt:ref"), + ex_libs => add(sub { +@@ -1385,7 +1385,7 @@ + sub { defined($ENV{'PORTSDK_LIBPATH'}) + ? '-I$(PORTSDK_LIBPATH)/../../include' : (); }, + sub { `cl 2>&1` =~ /Version ([0-9]+)\./ && $1>=14 +- ? ($disabled{shared} ? " /MT" : " /MD") ++ ? ($disabled{shared} ? " /MD" : " /MD") + : " /MC"; }), + debug => "/Od -DDEBUG -D_DEBUG", + release => "/O1i"), |