[jbossnative-commits] JBoss Native SVN: r3082 - trunk/build/patch.

Author: jfrederic.clere(a)jboss.com Date: 2013-06-06 10:18:19 -0400 (Thu, 06 Jun 2013) New Revision: 3082 Modified: trunk/build/patch/openssl-0.9.8i.patch Log: Use: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/native/srcl... Modified: trunk/build/patch/openssl-0.9.8i.patch =================================================================== --- trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 12:42:44 UTC (rev 3081) +++ trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 14:18:19 UTC (rev 3082) @@ -1,20 +1,28 @@ --- util/pl/VC-32.pl +++ util/pl/VC-32.pl -@@ -31,7 +31,7 @@ - $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE'; - $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 - $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- my $f = $shlib?' /MD':' /MT'; -+ my $f = $shlib?' /MD':' /MD'; +@@ -43,7 +43,7 @@ + # considered safe to ignore. + # + $base_cflags= " $mf_cflag"; +- 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'; -@@ -96,7 +96,7 @@ - $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; - $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 - $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- my $f = $shlib?' /MD':' /MT'; -+ my $f = $shlib?' /MD':' /MD'; +@@ -124,7 +124,7 @@ + else # Win32 + { + $base_cflags= " $mf_cflag"; +- 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'; +@@ -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}\./); ++ $ex_libs.=' $(EXTRA_LIBS)'; + # WIN32 UNICODE build gets linked with unicows.lib for + # backward compatibility with Win9x. + $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);