[jbossnative-commits] JBoss Native SVN: r3124 - trunk/build/unix.
Author: mladen.turk(a)jboss.com
Date: 2013-06-14 04:17:19 -0400 (Fri, 14 Jun 2013)
New Revision: 3124
Modified:
trunk/build/unix/build.sh
Log:
Favor -static option when building OpenSSL
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-14 06:54:31 UTC (rev 3123)
+++ trunk/build/unix/build.sh 2013-06-14 08:17:19 UTC (rev 3124)
@@ -675,8 +675,10 @@
ssl_static=$2
if $ssl_static ; then
ssl_common_dir=${build_common_dir}-static
+ ssl_win32_mk=nt.mak
else
ssl_common_dir=${build_common_dir}
+ ssl_win32_mk=ntdll.mak
fi
if [ -f ${ssl_common_dir}/include/openssl/opensslv.h ]; then
@@ -740,11 +742,9 @@
cygspawn perl Configure ${ssl_target} VC-WIN32
# openssl 1.0.x uses do_nasm, not do_masm :D
ms/do_nasm.bat
- nmake -f ms/nt.mak clean
- nmake -f ms/nt.mak || exit 1
- #CPERL=`cygpath -w /usr/bin/perl`
- #nmake -f ms/nt.mak install PERL="$CPERL"
- nmake -f ms/nt.mak install || exit 1
+ nmake -f ms/$ssl_win32_mk clean
+ nmake -f ms/$ssl_win32_mk || exit 1
+ nmake -f ms/$ssl_win32_mk install || exit 1
;;
windows-x64|windows-amd64)
echo "Doing: perl Configure ${ssl_target} VC-WIN64A"
@@ -752,8 +752,8 @@
rm -rf tmp32
cygspawn perl Configure ${ssl_target} VC-WIN64A
ms/do_win64a.bat
- nmake -f ms/nt.mak PERL=sperl || exit 1
- nmake -f ms/nt.mak PERL=sperl install
+ nmake -f ms/$ssl_win32_mk PERL=sperl || exit 1
+ nmake -f ms/$ssl_win32_mk PERL=sperl install
;;
windows-i64)
echo "Doing: perl Configure ${ssl_target} VC-WIN64I"
@@ -761,13 +761,8 @@
rm -rf tmp32
cygspawn perl Configure ${ssl_target} no-des VC-WIN64I
ms/do_win64i.bat
- nmake -f ms/nt.mak || exit 1
- nmake -f ms/nt.mak install
- #nmake -f ms/nt.mak
- #sed "s:=ml :=ias :" ms/nt.mak > $$.mak
- #mv $$.mak ms/nt.mak
- #sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak
- #mv $$.mak ms/ntdll.mak
+ nmake -f ms/$ssl_win32_mk || exit 1
+ nmake -f ms/$ssl_win32_mk install
;;
*)
./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1