[jbossnative-commits] JBoss Native SVN: r3087 - trunk/build/patch.
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-07 05:28:19 -0400 (Fri, 07 Jun 2013)
New Revision: 3087
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
try another fix.
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 07:23:39 UTC (rev 3086)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 09:28:19 UTC (rev 3087)
@@ -1,5 +1,5 @@
---- util/pl/VC-32.pl.orig 2010-05-27 15:16:28.000000000 +0200
-+++ util/pl/VC-32.pl 2013-06-07 09:21:08.371962819 +0200
+--- util/pl/VC-32.pl 2013-06-07 11:24:43.418413009 +0200
++++ util/pl/VC-32.pl 2013-06-07 11:25:55.801206458 +0200
@@ -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
@@ -18,11 +18,11 @@
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -371,6 +371,7 @@
- $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
- $ex.=' crypt32.lib';
- $ex.= $oflow;
-+ $ex.=' $(EXTRA_LIBS)';
- }
- $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
+@@ -170,6 +170,7 @@
+ {
+ $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
+ $ex_libs.= $oflow;
++ $ex_libs.=' $(EXTRA_LIBS)';
+ }
+