[jbossnative-commits] JBoss Native SVN: r3077 - trunk/build/patch.
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-04 07:56:00 -0400 (Tue, 04 Jun 2013)
New Revision: 3077
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
That patch failed....
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-04 09:58:57 UTC (rev 3076)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-04 11:56:00 UTC (rev 3077)
@@ -1,20 +1,20 @@
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -31,7 +31,7 @@
+--- util/pl/VC-32.pl 2013-06-04 07:50:54.201533400 -0400
++++ util/pl/VC-32.pl 2013-06-04 07:52:50.994670900 -0400
+@@ -49,7 +49,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';
+- my $f = $shlib || $fips ?' /MD':' /MT';
++ my $f = $shlib || $fips ?' /MD':' /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 @@
+@@ -114,7 +114,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';
+- my $f = $shlib || $fips ?' /MD':' /MT';
++ my $f = $shlib || $fips ?' /MD':' /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';