Author: rjung
Date: Sun May 24 17:11:41 2015
New Revision: 1681496
URL: http://svn.apache.org/r1681496
Log:
Sync with 1.1: the patch file there was newer
(although probably also outdated).
Modified:
tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch?rev=1681496&r1=1681495&r2=1681496&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch (original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch Sun May 24
17:11:41 2015
@@ -1,24 +1,24 @@
--- util/pl/VC-32.pl
+++ util/pl/VC-32.pl
-@@ -33,7 +33,7 @@
+@@ -43,7 +43,7 @@
# considered safe to ignore.
#
$base_cflags= " $mf_cflag";
-- my $f = $shlib?' /MD':' /MT';
+- my $f = $shlib || $fips ?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -114,7 +114,7 @@
+@@ -124,7 +124,7 @@
else # Win32
{
$base_cflags= " $mf_cflag";
-- my $f = $shlib?' /MD':' /MT';
+- my $f = $shlib || $fips ?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -165,6 +165,7 @@
+@@ -175,6 +175,7 @@
{
$ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1`
=~ /14\.00\.4[0-9]{4}\./);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
