diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-08 14:35:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-08 14:35:56 +0200 |
| commit | 1c772b16829364ce6a98f3b9584fe68f8f93f7d7 (patch) | |
| tree | 0666f9b398e1116b140db8ff1895bf132dea316e /external | |
| parent | d06269447f8de52fd35e4e97d127279cc3f84025 (diff) | |
openssl: fix WNT patch to apply
Change-Id: I31494d4314557672b7e3c2ff6846663fb9ed981a
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/opensslwnt.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/external/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch index b68e03715f2a..5be9c958a37a 100644 --- a/external/openssl/opensslwnt.patch +++ b/external/openssl/opensslwnt.patch @@ -96,7 +96,7 @@ --- misc/openssl-0.9.8v/util/pl/VC-32.pl 2010-02-04 02:10:24.000000000 +0100 +++ build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300 +0100 @@ -32,7 +32,7 @@ - $l_flags =~ s/-L(\S+)/\/libpath:$1/g; + my $ff = ""; # C compiler stuff -$cc='cl'; @@ -104,7 +104,7 @@ if ($FLAVOR =~ /WIN64/) { # Note that we currently don't have /WX on Win64! There is a lot of -@@ -103,21 +103,21 @@ +@@ -103,22 +103,22 @@ } $cc='$(CC)'; @@ -125,10 +125,11 @@ + $base_cflags= " $mf_cflag"; - my $f = $shlib || $fips ?' /MD':' /MT'; - $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib -- $opt_cflags=$f.' /Ox /O2 /Ob2'; -- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; + my $f = $shlib || $fips ? (($ENV{MSVC_USE_DEBUG_RUNTIME} eq "TRUE") ? ' -MDd' : ' -MD' ):' -MT'; + $lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $ff = "/fixed"; +- $opt_cflags=$f.' /Ox /O2 /Ob2'; +- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; + $opt_cflags=$f.' -Ox -O2 -Ob2'; + $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG'; $lflags="/nologo /subsystem:console /opt:ref"; |