Author: jfrederic.clere(a)jboss.com
Date: 2015-10-23 02:19:01 -0400 (Fri, 23 Oct 2015)
New Revision: 3420
Modified:
trunk/build/patch/openssl-1.0.2d.patch
Log:
Ajust the patch to 1.0.2d.
Modified: trunk/build/patch/openssl-1.0.2d.patch
===================================================================
--- trunk/build/patch/openssl-1.0.2d.patch 2015-10-22 16:24:04 UTC (rev 3419)
+++ trunk/build/patch/openssl-1.0.2d.patch 2015-10-23 06:19:01 UTC (rev 3420)
@@ -1,27 +1,28 @@
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -43,7 +43,7 @@
+---
util/pl/VC-32.pl.org 2015-10-23 08:12:42.497926371 +0200
++++ util/pl/VC-32.pl 2015-10-23 08:16:01.732299410 +0200
+@@ -45,7 +45,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';
-@@ -124,7 +124,7 @@
+ $lflags="/nologo /subsystem:console /opt:ref";
+@@ -130,7 +130,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
+ $ff = "/fixed";
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -175,6 +175,7 @@
+@@ -193,7 +193,7 @@
+ else
{
$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.=' 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.