Author: mladen.turk(a)jboss.com Date: 2013-01-16 01:31:56 -0500 (Wed, 16 Jan 2013) New Revision: 3026 Modified: trunk/build/patch/openssl-1.0.1c.patch trunk/build/unix/build.sh Log: Update patch and axe engines completely Modified: trunk/build/patch/openssl-1.0.1c.patch =================================================================== --- trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 19:27:51 UTC (rev 3025) +++ trunk/build/patch/openssl-1.0.1c.patch 2013-01-16 06:31:56 UTC (rev 3026) @@ -26,6 +26,18 @@ # 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 @@ Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-15 19:27:51 UTC (rev 3025) +++ trunk/build/unix/build.sh 2013-01-16 06:31:56 UTC (rev 3026) @@ -676,7 +676,7 @@ fi SSLNUM=`basename ${ssl_srcdir} | awk -F - '{ print $2}' | sed 's:[a-z]::'` echo "Configuring OpenSSL ${ssl_version} for ${BUILD_TAG} ..." - ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec no-ecdh no-ecdsa" + ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec no-ec2m no-ecdh no-ecdsa" if $ssl_static ; then ssl_build_flags="no-asm no-shared" else @@ -722,6 +722,7 @@ windows-x86) env; echo $PATH rm -rf tmp32 + rm -rf engines cygspawn perl Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} VC-WIN32 # openssl 1.0.x uses do_nasm, not do_masm :D ms/do_nasm.bat @@ -734,6 +735,7 @@ windows-x64|windows-amd64) echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A" rm -rf tmp32 + rm -rf engines cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A ms/do_win64a.bat nmake -f ms/ntdll.mak clean