Author: jfrederic.clere(a)jboss.com Date: 2008-03-03 11:58:07 -0500 (Mon, 03 Mar 2008) New Revision: 1410 Modified: trunk/build/unix/build.sh Log: Arrange openssl build. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-03 11:04:01 UTC (rev 1409) +++ trunk/build/unix/build.sh 2008-03-03 16:58:07 UTC (rev 1410) @@ -547,6 +547,10 @@ echo "Using cached openssl in ${ssl_common_dir}" return 0 fi + + if [ ! -d ${ssl_srcdir} ]; then + ssl_srcdir=srclib/`ls srclib | grep openssl-` + 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" @@ -556,9 +560,6 @@ ssl_build_flags="shared" fi ssl_target="--prefix=${ssl_common_dir} --openssldir=${ssl_common_dir}/ssl" - if [ ! -d ${ssl_srcdir} ]; then - ssl_srcdir=srclib/`ls srclib | grep openssl-` - fi echo "ssl_srcdir: $ssl_srcdir in: `pwd`" (cd ${ssl_srcdir} case ${BUILD_TAG} in @@ -611,21 +612,33 @@ hpux-parisc2) make install_sw || exit 1 # openssl-0.9.8b is broken (work-around it). - file ${ssl_common_dir}/lib/libssl.${so_extension} - if [ $? -ne 0 ]; then - rm -f ${ssl_common_dir}/lib/libssl.${so_extension} - cp -p libssl.${so_extension} ${ssl_common_dir}/lib - rm -f ${ssl_common_dir}/lib/libcrypto.${so_extension} - cp -p libcrypto.${so_extension} ${ssl_common_dir}/lib - fi + if $ssl_static; then + : + else + cat ${ssl_common_dir}/lib/libssl.${so_extension} > /dev/null + if [ $? -ne 0 ]; then + rm -f ${ssl_common_dir}/lib/libssl.${so_extension} + cp -p libssl.${so_extension} ${ssl_common_dir}/lib + rm -f ${ssl_common_dir}/lib/libcrypto.${so_extension} + cp -p libcrypto.${so_extension} ${ssl_common_dir}/lib + fi + fi ;; *) make install_sw || exit 1 ;; esac - if [ ! $ssl_static ] ; then + if $ssl_static; then + : + else (cd ${ssl_common_dir}/lib + if [ ! -f libcrypto.${so_extension}.${SSLNUM} ]; then + ln -s libcrypto.${so_extension} libcrypto.${so_extension}.${SSLNUM} + fi ln -s libcrypto.${so_extension}.${SSLNUM} libcrypto.${so_extension}.0 + if [ ! -f libssl.${so_extension}.${SSLNUM} ]; then + ln -s libssl.${so_extension} libssl.${so_extension}.${SSLNUM} + fi ln -s libssl.${so_extension}.${SSLNUM} libssl.${so_extension}.0 ) fi