Author: jfrederic.clere(a)jboss.com Date: 2015-10-22 12:03:37 -0400 (Thu, 22 Oct 2015) New Revision: 3417 Added: trunk/build/patch/openssl-1.0.2d.patch Log: Add missing /MT patch... Added: trunk/build/patch/openssl-1.0.2d.patch =================================================================== --- trunk/build/patch/openssl-1.0.2d.patch (rev 0) +++ trunk/build/patch/openssl-1.0.2d.patch 2015-10-22 16:03:37 UTC (rev 3417) @@ -0,0 +1,51 @@ +--- util/pl/VC-32.pl ++++ util/pl/VC-32.pl +@@ -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'; +@@ -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/); +--- crypto/md5/asm/md5-x86_64.pl ++++ crypto/md5/asm/md5-x86_64.pl +@@ -112,7 +112,7 @@ + my $output = shift; + if ($flavour =~ /\./) { $output = $flavour; undef $flavour; } + +-my $win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/); ++my $win64=0; $win64=1 if ($output =~ /\.asm$/); + + $0 =~ m/(.*[\/\\])[^\/\\]+$/; my $dir=$1; my $xlate; + ( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or + +--- engines/Makefile 2013-01-15 11:01:45.241463537 +0100 ++++ engines/Makefile 2013-01-15 11:02:33.231013924 +0100 +@@ -11,7 +11,7 @@ + AR= ar r + ENGDIRS= ccgost + +-RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ ++RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in "$(ENGDIRS)" ; do \ + (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ + $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ + done;